From 7bf2f4d67cd052ca676a3255bfd1777640da1bf0 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 23 Jul 2009 14:37:47 +0000
Subject: [PATCH] Changes contributed by Chris Kampmeier (Sun) to enable building pkg(5) zip off the network. This resolve issue 4008.
---
opendj-sdk/opends/src/pkg/opends-dsml-gateway_proto.py | 13 +++++++++++--
opendj-sdk/opends/src/pkg/opends_proto.py | 13 ++++++++-----
opendj-sdk/opends/build-pkg.xml | 30 +++++++++++++++++++++---------
opendj-sdk/opends/build.properties | 3 ---
4 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/opendj-sdk/opends/build-pkg.xml b/opendj-sdk/opends/build-pkg.xml
index 36a2b1a..181c10b 100644
--- a/opendj-sdk/opends/build-pkg.xml
+++ b/opendj-sdk/opends/build-pkg.xml
@@ -29,20 +29,33 @@
This is a build script that extends the OpenDS build script by adding
the generation of pkg(5) format packages and a pkg(5)-based installation image.
- To make use of this build script, ensure that this file is placed in the same
- directory as your build.xml file and add an import of this file at the top
- of the build.xml file.
+ The following properties may be ones that you would like to override via
+ the build.properties file:
+
+ pkg.toolkit.dir - pkg(5) toolkit external dependency.
+
+ pkg.toolkit.repo.dir - pkg(5) toolkit repository from which the "pkg-java"
+ package is installed.
+
+ pkg.authority - Depending on whether you're building a community or
+ commercial bundle, you may want to specify different values.
+
+ pkg.repo.url - Depending on whether you're building a communituy or
+ commercial bundle, you want to specify different values.
</description>
+ <property name="pkg.toolkit.dir" location="${ext.dir}/pkg-toolkit"/>
+ <property name="pkg.toolkit.repo.dir" location="${ext.dir}/pkg-toolkit-repo"/>
+
<condition property="ispkgtoolkitpresent">
<and>
<available file="${pkg.toolkit.dir}/pkg/lib/pkg-ant-tasks.xml"/>
+ <available file="${pkg.toolkit.repo.dir}/catalog" type="dir"/>
</and>
</condition>
<import file="${pkg.toolkit.dir}/pkg/lib/pkg-ant-tasks.xml" optional="true"/>
-
<target name="pkg5messagebuild" if="ispkgtoolkitpresent">
<echo message="pkg(5) delivery will be built."/>
</target>
@@ -56,14 +69,15 @@
<target name="pkg5echo" depends="pkg5messageNotbuild,pkg5messagebuild"/>
<target name="-pkg-init" if="ispkgtoolkitpresent" depends="pkg5echo">
+ <property name="pkg.authority" value="dev.opends.org"/>
+ <property name="pkg.repo.url" value="http://pkg.opends.org/dev/"/>
+
<echo message="pkg.toolkit.dir is ${pkg.toolkit.dir}" />
<property name="pkg.build.dir" location="${package.dir}/pkg"/>
<property name="pkg.reference.install.dir" location="${pkg.build.dir}/reference-install"/>
<property name="pkg.repo.dir" location="${pkg.build.dir}/repo"/>
<property name="pkg.image.container.dir" location="${pkg.build.dir}/image/"/>
<property name="pkg.image.dir" location="${pkg.image.container.dir}/${SHORT_NAME}"/>
- <property name="pkg.authority" value="dev.sun.com"/>
- <property name="pkg.toolkit.repo.url" value="http://pkg.sun.com/layered-collection/dev"/>
<property name="pkg.java.name" value="pkg-java"/>
</target>
@@ -146,7 +160,7 @@
<!-- Now add the "pkg-java" Java bootstrap for pkg(5) package to the
pre-installed image. -->
- <makeimage repourl="${pkg.toolkit.repo.url}" imagedir="${pkg.image.dir}" authority="${pkg.authority}" title="${SHORT_NAME}" description="OpenDS is comprehensive next generation directory service. OpenDS is designed to address large deployments, to provide high performance, to be highly extensible, and to be easy to deploy, manage and monitor. ">
+ <makeimage repourl="file://${pkg.toolkit.repo.dir}" imagedir="${pkg.image.dir}" authority="${pkg.authority}" title="${SHORT_NAME}" description="OpenDS is comprehensive next generation directory service. OpenDS is designed to address large deployments, to provide high performance, to be highly extensible, and to be easy to deploy, manage and monitor. ">
<packages>
<package name="${pkg.java.name}"/>
</packages>
@@ -174,14 +188,12 @@
<makezip basedir="${pkg.image.container.dir}" destfile="${pkg.build.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}-image.zip" include="${SHORT_NAME}"/>
</target>
-
<target name="-pkg-copy-windows" if="os.windows">
<copy todir="${pkg.reference.install.dir}/opends">
<fileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"/>
</copy>
</target>
-
<target name="-pkg-copy-unix" unless="os.windows">
<exec dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" executable="cp">
<arg line="-r . ${pkg.reference.install.dir}/opends"/>
diff --git a/opendj-sdk/opends/build.properties b/opendj-sdk/opends/build.properties
index 6069e05..1c30b84 100644
--- a/opendj-sdk/opends/build.properties
+++ b/opendj-sdk/opends/build.properties
@@ -1,5 +1,2 @@
opendmk.lib.dir=
-pkg.toolkit.dir=
-
-
diff --git a/opendj-sdk/opends/src/pkg/opends-dsml-gateway_proto.py b/opendj-sdk/opends/src/pkg/opends-dsml-gateway_proto.py
index fe1ad5a..8478f76 100644
--- a/opendj-sdk/opends/src/pkg/opends-dsml-gateway_proto.py
+++ b/opendj-sdk/opends/src/pkg/opends-dsml-gateway_proto.py
@@ -31,8 +31,17 @@
"version" : "@{version}",
"attributes" : {
"pkg.summary" : "OpenDS DSML Gateway",
- "info.classification" : "Directory Services",
- "pkg.description" : "OpenDS DSML Gateway WAR File"
+ "info.classification" : ":Directory Services",
+ "pkg.description" : "OpenDS supports DSML through a DSML gateway, \
+which is implemented as a Web application that can run in an application server. A DSML \
+gateway (or DSML-to-LDAP gateway) is a special type of network daemon that is used to \
+translate between DSML and LDAP. In general, a DSML gateway accepts DSML requests from \
+clients, converts them to LDAP requests that it forwards to a directory server for \
+processing. It then translates the LDAP response from the directory server back \
+to DSML to return to the client. ",
+ "pkg.detailed_url" : "https://www.opends.org/wiki",
+ "info.maintainer_url" : "http://www.opends.org/",
+ "info.upstream_url" : "http://www.opends.org/",
},
"dirs" : {
diff --git a/opendj-sdk/opends/src/pkg/opends_proto.py b/opendj-sdk/opends/src/pkg/opends_proto.py
index 7b59934..ec96957 100644
--- a/opendj-sdk/opends/src/pkg/opends_proto.py
+++ b/opendj-sdk/opends/src/pkg/opends_proto.py
@@ -31,12 +31,15 @@
"name" : "opends",
"version" : "@{version}",
"attributes" : {
- "pkg.summary" : "OpenDS",
+ "pkg.summary" : "OpenDS Open Source Java LDAP Directory Service",
"info.classification" : "Directory Services",
- "pkg.description" : "OpenDS is an open source community project\
-building a free and comprehensive\
-next generation directory service,\
-based on LDAP and DSML standards."
+ "pkg.description" : "Core components of the OpenDS Open Source Java LDAP \
+Directory Service. OpenDS is a free and comprehensive next generation directory service based on \
+LDAP and DSML. OpenDS is designed to address large deployments, to provide high performance, \
+to be highly extensible, and to be easy to deploy, manage and monitor.",
+ "pkg.detailed_url" : "https://www.opends.org/wiki",
+ "info.maintainer_url" : "http://www.opends.org/",
+ "info.upstream_url" : "http://www.opends.org/",
},
"dirs" : {
--
Gitblit v1.10.0