From 81d1cda10ee7d9a46e1cbd1ac9527211e8c31711 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 27 Feb 2012 23:04:03 +0000
Subject: [PATCH] Update copyright year and doc link for SVR4 package.
---
opendj-sdk/opends/src/svr4/OpenDJ/opendj-manifest.xml | 26 +++++++++++++-------------
opendj-sdk/opends/src/svr4/OpenDJ/copyright | 2 +-
opendj-sdk/opends/src/svr4/OpenDJ/layout.xml | 13 +++++++------
opendj-sdk/opends/src/svr4/OpenDJ/README | 2 +-
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/opendj-sdk/opends/src/svr4/OpenDJ/README b/opendj-sdk/opends/src/svr4/OpenDJ/README
index 5435bfa..408cfe8 100644
--- a/opendj-sdk/opends/src/svr4/OpenDJ/README
+++ b/opendj-sdk/opends/src/svr4/OpenDJ/README
@@ -2,7 +2,7 @@
This archive contains OpenDJ, the Open source Directory services in Java.
Complete documentation for this product may be found online at
-https://wikis.forgerock.org/confluence/display/OPENDJ/OpenDJ+Documentation.
+http://opendj.forgerock.org/docs.html.
To configure the server, run the configure script.
diff --git a/opendj-sdk/opends/src/svr4/OpenDJ/copyright b/opendj-sdk/opends/src/svr4/OpenDJ/copyright
index b621425..7970af9 100644
--- a/opendj-sdk/opends/src/svr4/OpenDJ/copyright
+++ b/opendj-sdk/opends/src/svr4/OpenDJ/copyright
@@ -22,7 +22,7 @@
Copyright 2009-2010 Sun Microsystems, Inc.
- Portions Copyright 2010-2011 ForgeRock AS
+ Portions Copyright 2010-2012 ForgeRock AS
--------------------------------------------------------------------
diff --git a/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml b/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml
index 5c891b1..ebf1bb8 100644
--- a/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml
+++ b/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml
@@ -31,7 +31,7 @@
This is a build script that extends the OpenDJ build script by adding
SVR4 packaging functions.
</description>
-
+
<target name="pkgversion"
description="Set svr4.version property" >
@@ -46,14 +46,14 @@
</taskdef>
<getversionnumber property="svr4.fullversion" />
- <property name="svr4.version"
+ <property name="svr4.version"
value="${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}" />
</target>
<property name="resource.dir" location="src/resource" />
<!-- Construct layout -->
- <target name="layout" if="isSunOS"
+ <target name="layout" if="isSunOS"
description="Create layout based on zip layout" >
<!-- Get the revision number of the current Subversion workspace -->
<taskdef name="getsvnrevision"
@@ -68,12 +68,12 @@
</classpath>
</taskdef>
- <getsvnrevision property="REVISION_NUMBER" />
+ <getsvnrevision property="REVISION_NUMBER" />
<property name="zip.dir"
location="${package.dir}/${product}-${svr4.fullversion}" />
-
- <echo
+
+ <echo
message="Building layout for ${svr4.name} pkg based on ${zip.dir}" />
<!-- copy ZIP layout.
Use exec instead of copy task to preserve file permissions -->
@@ -83,6 +83,7 @@
<arg value="${zip.dir}"/>
<arg value="${svr4.layout.pkg.dir}"/>
</exec>
+ <chmod dir="${svr4.layout.pkg.dir}" perm="755"/>
<!-- Remove Windows specific files -->
<delete includeemptydirs="true">
<fileset dir="${svr4.layout.pkg.dir}" includes="**/*.exe"/>
diff --git a/opendj-sdk/opends/src/svr4/OpenDJ/opendj-manifest.xml b/opendj-sdk/opends/src/svr4/OpenDJ/opendj-manifest.xml
index 572ed3e..efd80b0 100644
--- a/opendj-sdk/opends/src/svr4/OpenDJ/opendj-manifest.xml
+++ b/opendj-sdk/opends/src/svr4/OpenDJ/opendj-manifest.xml
@@ -26,7 +26,7 @@
Copyright 2008 Sun Microsystems, Inc.
- Portions Copyright 2010-2011 ForgeRock AS.
+ Portions Copyright 2010-2012 ForgeRock AS.
-->
<service_bundle type='manifest' name='opendj'>
<service name='network/ldap/server' type='service' version='1'>
@@ -36,23 +36,23 @@
and methods within the instance.
-->
<instance name='opendj' enabled='false'>
- <!--
- Wait for network interfaces to be initialized.
+ <!--
+ Wait for network interfaces to be initialized.
-->
<dependency
- name='network'
- grouping='require_all'
- restart_on='error'
+ name='network'
+ grouping='require_all'
+ restart_on='error'
type='service'>
<service_fmri value='svc:/milestone/network:default' />
</dependency>
- <!--
- Wait for all local filesystems to be mounted.
+ <!--
+ Wait for all local filesystems to be mounted.
-->
<dependency
- name='filesystem-local'
- grouping='require_all'
- restart_on='none'
+ name='filesystem-local'
+ grouping='require_all'
+ restart_on='none'
type='service'>
<service_fmri value='svc:/system/filesystem/local:default' />
</dependency>
@@ -97,8 +97,8 @@
</loctext>
</common_name>
<documentation>
- <doc_link name='OpenDJ Documentation Wiki'
- uri='https://wikis.forgerock.org/confluence/display/opendj/Home' />
+ <doc_link name='OpenDJ Documentation'
+ uri='http://opendj.forgerock.org/docs.html' />
</documentation>
</template>
</instance>
--
Gitblit v1.10.0