From a18a9e10be5b37f693db6c0e2d9b14a62c607fad Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 10 Nov 2015 16:43:46 +0000
Subject: [PATCH] OPENDJ-2388 Remove support for package pkg(5)
---
/dev/null | 88 --------------------------------------------
opendj-server-legacy/build.xml | 1
2 files changed, 0 insertions(+), 89 deletions(-)
diff --git a/opendj-server-legacy/build-pkg.xml b/opendj-server-legacy/build-pkg.xml
deleted file mode 100644
index 6739a2a..0000000
--- a/opendj-server-legacy/build-pkg.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- ! or http://forgerock.org/license/CDDLv1.0.html.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at legal-notices/CDDLv1_0.txt.
- ! If applicable, add the following below this CDDL HEADER, with the
- ! fields enclosed by brackets "[]" replaced with your own identifying
- ! information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- !
- ! Copyright 2006-2009 Sun Microsystems, Inc.
- ! -->
-<project name="Directory Server pkg(5) Packaging" basedir="." default="package-pkg-image">
- <description>
- 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.
-
- 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>
-
- <target name="pkg5messageNotbuild" unless="ispkgtoolkitpresent">
- <echo message="No pkg(5) delivery built."/>
- <echo message="To build with pkg(5) delivery set pkg.toolkit.dir build property"/>
- <echo message="to indicate the location of pkg(5) toolkit"/>
- </target>
-
- <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.java.name" value="pkg-java"/>
- </target>
-
- <target name="package-pkg-make-packages" if="ispkgtoolkitpresent" depends="dynamicconstants, -pkg-init" description="Publish pkg(5)-based packages to a new repository.">
-
- <!-- Copy OpenDS content to the reference installlation area from which the package
- content will be published.
-
- The reason we're copying the existing "package/OpenDS<version>/" area
- is that we need we need to insert an opends/ umbrella directory as
- the base relative directory within the packages.
-
- The OpenDS project team will ultimately decide how many packages they
- want to create and where the content of those packages will be installed.
- -->
-
- <!-- First copy the DSML content into the reference installation area.
- The OpenDS project team will decide the most appropriate location
- for the DSML component. In this example, we package the DSML
- component in a separate package.
- -->
- <delete dir="${pkg.reference.install.dir}"/>
-
- <copy tofile="${pkg.reference.install.dir}/opends/dsml/opends-dsml.war" file="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}-DSML.war"/>
- <copy tofile="${pkg.reference.install.dir}/opends/dsml/legal-notices/CDDLv1_0.txt" file="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}/legal-notices/CDDLv1_0.txt"/>
-
- <!-- Copy the core OpenDS content to the reference installation area.
- Copy on Unix platforms entails the use of a copy approach that
- preserves execution bit settings that are already in effect
- by virtue of the main OpenDS build.xml.
- -->
- <antcall target="-pkg-copy-windows"/>
- <antcall target="-pkg-copy-unix"/>
- <antcall target="create-tmpl-instance"/>
-
- <delete dir="${pkg.repo.dir}"/>
-
- <!-- Publish the OpenDS packages to an empty repository. -->
- <makepkgs repourl="file://${pkg.repo.dir}" basedir="${pkg.reference.install.dir}" version="${VERSION_NUMBER_STRING},0-0.${REVISION_NUMBER}">
- <fileset dir="src/pkg">
- <include name="opends_proto.py"/>
- <include name="opends-dsml-gateway_proto.py"/>
- </fileset>
- </makepkgs>
-
- <zip destfile="${package.dir}/pkg/${SHORT_NAME}-${VERSION_NUMBER_STRING}-repo.zip" basedir="${pkg.repo.dir}"/>
-
- </target>
-
- <target name="package-publish" if="ispkgtoolkitpresent" description="Publish packages" depends="dynamicconstants, -pkg-init">
- <!-- Publish the OpenDS packages to current repository. -->
- <echo message="pkg.repo.url=${pkg.repo.url}" />
- <!--
- <makepkgs repourl="${pkg.repo.url}" basedir="${pkg.reference.install.dir}" version="${VERSION_NUMBER_STRING},0-0.${REVISION_NUMBER}">
- <fileset dir="src/pkg">
- <include name="opends_proto.py"/>
- <include name="opends-dsml-gateway_proto.py"/>
- </fileset>
- </makepkgs>
- -->
- </target>
-
- <target name="package-pkg-make-image" if="ispkgtoolkitpresent" depends="package-pkg-make-packages" description="Assemble pre-installed pkg(5)-based image.">
-
- <!-- Assemble a universal image containing the core OpenDS package and the
- package containing the pkg(5) Java client API and bootstrap facility.
- We are only pre-installing the ones of interest for the initial download.
- The other packages will be available for installation from the repository
- later on after the initial installation takes place. -->
-
- <delete dir="${pkg.image.dir}"/>
-
- <!-- First, create the pre-installed image and add the product-specific
- packages. -->
- <makeimage repourl="file://${pkg.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="opends"/>
- </packages>
- </makeimage>
-
- <!-- Now add the "pkg-java" Java bootstrap for pkg(5) package to the
- pre-installed image. -->
- <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>
- </makeimage>
-
- <!-- Copy bootstub scripts to the image. When a user executes one of these
- commands, the user will be asked if he wants to dynamically complete the
- installation of the pkg(5) and Update Tool packages. If the user answers
- 'yes', then the bootstucb scripts will invoke the pkg(5) Java Bootstrap
- facility to use Java to install these packages. -->
- <mkdir dir="${pkg.image.dir}/bin"/>
- <copy tofile="${pkg.image.dir}/bin/pkg" file="${pkg.toolkit.dir}/pkg/lib/pkg-bootstub.sh"/>
- <copy tofile="${pkg.image.dir}/bin/pkg.bat" file="${pkg.toolkit.dir}/pkg/lib/pkg-bootstub.bat"/>
- <copy tofile="${pkg.image.dir}/bin/updatetool" file="${pkg.toolkit.dir}/pkg/lib/pkg-bootstub.sh"/>
- <copy tofile="${pkg.image.dir}/bin/updatetool.bat" file="${pkg.toolkit.dir}/pkg/lib/pkg-bootstub.bat"/>
- <chmod file="${pkg.image.dir}/bin/pkg" perm="ugo+rwx"/>
- <chmod file="${pkg.image.dir}/bin/updatetool" perm="ugo+rwx"/>
-
- <!-- Edit the cfg_cache file to specify the repository URL that the
- image will use. -->
- <replace file="${pkg.image.dir}/.org.opensolaris,pkg/cfg_cache">
- <replacefilter token="http://localhost:10001/" value="${pkg.repo.url}"/>
- </replace>
-
- <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"/>
- </exec>
- </target>
-
- <target name="create-tmpl-instance">
- <!-- Replace zip upgrade script by pkg upgrade script -->
- <delete file="${pkg.reference.install.dir}/opends/upgrade" />
- <copy file="${resource.dir}/upgrade_svr4"
- tofile="${pkg.reference.install.dir}/opends/upgrade" />
- <chmod file="${pkg.reference.install.dir}/opends/upgrade" perm="755" />
- <!-- Copy instance files in ${pkg.reference.install.dir}/tmpl_instance -->
- <mkdir dir="${pkg.reference.install.dir}/opends/tmpl_instance"/>
- <chmod dir="${pkg.reference.install.dir}/opends/tmpl_instance" perm="755"/>
- <mkdir dir="${pkg.reference.install.dir}/opends/tmpl_instance/lib"/>
- <chmod dir="${pkg.reference.install.dir}/opends/tmpl_instance/lib" perm="755"/>
- <mkdir dir="${pkg.reference.install.dir}/opends/tmpl_instance/lib/extensions"/>
- <chmod dir="${pkg.reference.install.dir}/opends/tmpl_instance/lib/extensions"
- perm="755"/>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/bak">
- <fileset dir="${pkg.reference.install.dir}/opends/bak"/>
- </copy>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/changelogDb">
- <fileset dir="${pkg.reference.install.dir}/opends/changelogDb"/>
- </copy>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/classes">
- <fileset dir="${pkg.reference.install.dir}/opends/classes"/>
- </copy>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/config">
- <fileset dir="${pkg.reference.install.dir}/opends/config"/>
- </copy>
- <mkdir dir="${pkg.reference.install.dir}/opends/config"/>
- <chmod dir="${pkg.reference.install.dir}/opends/config" perm="755"/>
- <copy todir="${pkg.reference.install.dir}/opends/config/schema">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/config/schema"/>
- </copy>
- <mkdir dir="${pkg.reference.install.dir}/opends/tmpl_instance/config/schema"/>
- <chmod dir="${pkg.reference.install.dir}/opends/tmpl_instance/config/schema"
- perm="755"/>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/db">
- <fileset dir="${pkg.reference.install.dir}/opends/db"/>
- </copy>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/import-tmp">
- <fileset dir="${pkg.reference.install.dir}/opends/import-tmp"/>
- </copy>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/ldif">
- <fileset dir="${pkg.reference.install.dir}/opends/ldif"/>
- </copy>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/locks">
- <fileset dir="${pkg.reference.install.dir}/opends/locks"/>
- </copy>
- <copy todir="${pkg.reference.install.dir}/opends/tmpl_instance/logs">
- <fileset dir="${pkg.reference.install.dir}/opends/logs"/>
- </copy>
- <!-- Create buildinfo files -->
- <echo message="${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}.${REVISION_NUMBER}"
- file="${pkg.reference.install.dir}/opends/tmpl_instance/config/buildinfo" />
- <echo message="${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}.${REVISION_NUMBER}"
- file="${pkg.reference.install.dir}/opends/config/buildinfo" />
- <!-- Remove config/upgrade files -->
- <delete file="${pkg.reference.install.dir}/opends/config/upgrade/config.ldif.${REVISION_NUMBER}" />
- <delete file="${pkg.reference.install.dir}/opends/config/upgrade/schema.ldif.${REVISION_NUMBER}" />
- </target>
-
- <target name="configure-instance">
- <!-- Copy instance files in ${pkg.image.dir} -->
- <copy todir="${pkg.image.dir}/opends/bak">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/bak"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/changelogDb">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/changelogDb"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/classes">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/classes"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/config">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/config"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/db">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/db"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/import-tmp">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/import-tmp"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/ldif">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/ldif"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/locks">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/locks"/>
- </copy>
- <copy todir="${pkg.image.dir}/opends/logs">
- <fileset dir="${pkg.reference.install.dir}/opends/tmpl_instance/logs"/>
- </copy>
- </target>
-
-</project>
diff --git a/opendj-server-legacy/build.xml b/opendj-server-legacy/build.xml
index 0456215..758cf2a 100644
--- a/opendj-server-legacy/build.xml
+++ b/opendj-server-legacy/build.xml
@@ -2793,5 +2793,4 @@
<ivy:cleancache/>
</target>
- <import file="build-pkg.xml"/>
</project>
diff --git a/opendj-server-legacy/src/pkg/opends-dsml-gateway_proto.py b/opendj-server-legacy/src/pkg/opends-dsml-gateway_proto.py
deleted file mode 100644
index 8b5651f..0000000
--- a/opendj-server-legacy/src/pkg/opends-dsml-gateway_proto.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
-# or http://forgerock.org/license/CDDLv1.0.html.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at legal-notices/CDDLv1_0.txt.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.
-#
-pkg = {
- "name" : "opends-dsml-gateway",
- "version" : "@{version}",
- "attributes" : {
- "pkg.summary" : "OpenDS DSML Gateway",
- "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" : {
- "opends" : {"mode" : "0755"},
- "opends/dsml" : {"mode" : "0755"},
- },
-
- "dirtrees" : [ "opends/dsml" ],
-
- "licenses" : {
- "opends/dsml/legal-notices/CDDLv1_0.txt" : {"license" : "CDDLv1.0" },
- }
-}
-
diff --git a/opendj-server-legacy/src/pkg/opends_proto.py b/opendj-server-legacy/src/pkg/opends_proto.py
deleted file mode 100644
index 944d1b1..0000000
--- a/opendj-server-legacy/src/pkg/opends_proto.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
-# or http://forgerock.org/license/CDDLv1.0.html.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at legal-notices/CDDLv1_0.txt.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.
-#
-
-pkg = {
- "name" : "opends",
- "version" : "@{version}",
- "attributes" : {
- "pkg.summary" : "OpenDS Open Source Java LDAP Directory Service",
- "info.classification" : "Directory Services",
- "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" : {
- "opends" : {"mode" : "0755"},
- },
-
- "excludefiles" : [
- "opends/dsml/opends-dsml.war",
- "opends/dsml/legal-notices/CDDLv1_0.txt",
- ],
- "files": {
- "opends/config/messages/password-reset.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-unlocked.template" : {"preserve":"strawberry"},
- "opends/config/messages/password-expired.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-expired.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-temporarily-locked.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-permanently-locked.template" : {"preserve":"strawberry"},
- "opends/config/messages/password-expiring.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-idle-locked.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-disabled.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-enabled.template" : {"preserve":"strawberry"},
- "opends/config/messages/password-changed.template" : {"preserve":"strawberry"},
- "opends/config/messages/account-reset-locked.template" : {"preserve":"strawberry"},
- "opends/config/MakeLDIF/cities" : {"preserve":"strawberry"},
- "opends/config/MakeLDIF/first.names" : {"preserve":"strawberry"},
- "opends/config/MakeLDIF/last.names" : {"preserve":"strawberry"},
- "opends/config/MakeLDIF/states" : {"preserve":"strawberry"},
- "opends/config/MakeLDIF/example.template" : {"preserve":"strawberry"},
- "opends/config/MakeLDIF/streets" : {"preserve":"strawberry"},
- "opends/config/config.ldif" : {"preserve":"strawberry"},
- "opends/config/admin-backend.ldif" : {"preserve":"strawberry"},
- "opends/config/java.properties" : {"preserve":"strawberry"},
- "opends/config/wordlist.txt" : {"preserve":"strawberry"},
- "opends/config/tools.properties" : {"preserve":"strawberry"},
- "opends/config/buildinfo" : {"preserve":"strawberry"},
- },
-
- "dirtrees" : [
- "opends"
- ],
-
- "licenses" : {
- "opends/legal-notices/CDDLv1_0.txt" : {"license" : "CDDLv1.0" },
- "opends/legal-notices/THIRDPARTYREADME.txt" : {"license" : "Third party" },
- }
-}
-
--
Gitblit v1.10.0