You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/09/02 23:26:29 UTC

svn commit: r267285 - in /directory/standalone/trunk/osgi: ./ apacheds/project.xml changepw/project.xml dns/project.xml jmx/project.xml kerberos/project.xml ldap/project.xml loader/project.xml network/project.xml ntp/project.xml project.xml

Author: erodriguez
Date: Fri Sep  2 14:26:23 2005
New Revision: 267285

URL: http://svn.apache.org/viewcvs?rev=267285&view=rev
Log:
Maven POM updates related to top-leveling subproject for Directory OSGi bundles.

Modified:
    directory/standalone/trunk/osgi/   (props changed)
    directory/standalone/trunk/osgi/apacheds/project.xml
    directory/standalone/trunk/osgi/changepw/project.xml
    directory/standalone/trunk/osgi/dns/project.xml
    directory/standalone/trunk/osgi/jmx/project.xml
    directory/standalone/trunk/osgi/kerberos/project.xml
    directory/standalone/trunk/osgi/ldap/project.xml
    directory/standalone/trunk/osgi/loader/project.xml
    directory/standalone/trunk/osgi/network/project.xml
    directory/standalone/trunk/osgi/ntp/project.xml
    directory/standalone/trunk/osgi/project.xml

Propchange: directory/standalone/trunk/osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep  2 14:26:23 2005
@@ -0,0 +1,6 @@
+bin
+build
+target
+classes
+.classpath
+.project

Modified: directory/standalone/trunk/osgi/apacheds/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/apacheds/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/apacheds/project.xml (original)
+++ directory/standalone/trunk/osgi/apacheds/project.xml Fri Sep  2 14:26:23 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-store</artifactId>
   <name>Apache Backing Store</name>
   <currentVersion>0.1.1</currentVersion>
@@ -10,7 +8,6 @@
     <osgi.export.package>org.apache.ldap.common.util,org.apache.ldap.common.message.spi,org.apache.ldap.common,org.apache.ldap.common.message,org.apache.ldap.common.exception,org.apache.ldap.common.filter,org.apache.ldap.server.jndi,org.apache.ldap.server.configuration</osgi.export.package>
     <osgi.import.package>org.osgi.framework</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.store</package>
   <shortDescription>Apache Backing Store</shortDescription>
   <description>Apache Backing Store</description>

Modified: directory/standalone/trunk/osgi/changepw/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/changepw/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/changepw/project.xml (original)
+++ directory/standalone/trunk/osgi/changepw/project.xml Fri Sep  2 14:26:23 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-changepw</artifactId>
   <name>Apache Change Password Network Service</name>
   <currentVersion>0.1.1</currentVersion>
@@ -10,7 +8,6 @@
     <osgi.bundle.category>Network Service</osgi.bundle.category>
     <osgi.import.package>org.apache.ldap.server.configuration,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.common,org.osgi.service.cm,org.osgi.util.tracker</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.changepw</package>
   <shortDescription>Apache Change Password Network Service</shortDescription>
   <description>Apache Change Password Network Service</description>

Modified: directory/standalone/trunk/osgi/dns/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/dns/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/dns/project.xml (original)
+++ directory/standalone/trunk/osgi/dns/project.xml Fri Sep  2 14:26:23 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-dns</artifactId>
   <name>Apache DNS Network Service</name>
   <currentVersion>0.1.1</currentVersion>
@@ -10,7 +8,6 @@
     <osgi.bundle.category>Network Service</osgi.bundle.category>
     <osgi.import.package>org.apache.ldap.server.jndi,org.apache.ldap.server.configuration,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.common,org.osgi.service.cm,org.osgi.util.tracker</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.dns</package>
   <shortDescription>Apache DNS Network Service</shortDescription>
   <description>Apache DNS Network Service</description>

Modified: directory/standalone/trunk/osgi/jmx/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/jmx/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/jmx/project.xml (original)
+++ directory/standalone/trunk/osgi/jmx/project.xml Fri Sep  2 14:26:23 2005
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-jmxlogger</artifactId>
   <name>Apache JMX Logger Bundle</name>
   <currentVersion>0.1.1</currentVersion>
   <properties>
     <osgi.import.package>org.osgi.framework</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.jmx</package>
   <shortDescription>Apache JMX Logger Bundle</shortDescription>
   <description>Apache JMX Logger Bundle</description>

Modified: directory/standalone/trunk/osgi/kerberos/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/kerberos/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/kerberos/project.xml (original)
+++ directory/standalone/trunk/osgi/kerberos/project.xml Fri Sep  2 14:26:23 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-kerberos</artifactId>
   <name>Apache Kerberos Network Service</name>
   <currentVersion>0.1.1</currentVersion>
@@ -10,7 +8,6 @@
     <osgi.bundle.category>Network Service</osgi.bundle.category>
     <osgi.import.package>org.apache.ldap.server.configuration,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.common,org.osgi.service.cm,org.osgi.util.tracker</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.kerberos</package>
   <shortDescription>Apache Kerberos Network Service</shortDescription>
   <description>Apache Kerberos Network Service</description>

Modified: directory/standalone/trunk/osgi/ldap/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ldap/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/ldap/project.xml (original)
+++ directory/standalone/trunk/osgi/ldap/project.xml Fri Sep  2 14:26:23 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-ldap</artifactId>
   <name>Apache LDAP Network Service</name>
   <currentVersion>0.1.1</currentVersion>
@@ -10,7 +8,6 @@
     <osgi.bundle.category>Network Service</osgi.bundle.category>
     <osgi.import.package>org.apache.ldap.common.filter,org.apache.ldap.server.configuration,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.protocol.handler,org.apache.mina.protocol.codec,org.apache.mina.common,org.osgi.service.cm,org.osgi.util.tracker</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.ldap</package>
   <shortDescription>Apache LDAP Network Service</shortDescription>
   <description>Apache LDAP Network Service</description>

Modified: directory/standalone/trunk/osgi/loader/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/loader/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/loader/project.xml (original)
+++ directory/standalone/trunk/osgi/loader/project.xml Fri Sep  2 14:26:23 2005
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-loader</artifactId>
   <name>Apache LDIF Loader</name>
   <currentVersion>0.1.1</currentVersion>
   <properties>
     <osgi.import.package>org.apache.ldap.server.configuration</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.loader</package>
   <shortDescription>Apache LDIF Loader</shortDescription>
   <description>Apache LDIF Loader</description>

Modified: directory/standalone/trunk/osgi/network/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/network/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/network/project.xml (original)
+++ directory/standalone/trunk/osgi/network/project.xml Fri Sep  2 14:26:23 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-mina</artifactId>
   <name>Apache MINA Network Service Registry</name>
   <currentVersion>0.1.1</currentVersion>
@@ -10,7 +8,6 @@
     <osgi.import.package>org.osgi.framework</osgi.import.package>
     <osgi.export.package>org.apache.mina.protocol.handler,org.apache.mina,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.protocol.codec,org.apache.mina.common</osgi.export.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.mina</package>
   <shortDescription>Apache MINA Network Service Registry</shortDescription>
   <description>Apache MINA Network Service Registry</description>

Modified: directory/standalone/trunk/osgi/ntp/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ntp/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/ntp/project.xml (original)
+++ directory/standalone/trunk/osgi/ntp/project.xml Fri Sep  2 14:26:23 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
   <artifactId>apache-ntp</artifactId>
   <name>Apache NTP Network Service</name>
   <currentVersion>0.1.1</currentVersion>
@@ -10,7 +8,6 @@
     <osgi.bundle.category>Network Service</osgi.bundle.category>
     <osgi.import.package>org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.common,org.osgi.service.cm,org.osgi.util.tracker</osgi.import.package>
   </properties>
-  <inceptionYear>2005</inceptionYear>
   <package>org.apache.ntp</package>
   <shortDescription>Apache NTP Network Service</shortDescription>
   <description>Apache NTP Network Service</description>

Modified: directory/standalone/trunk/osgi/project.xml
URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/project.xml?rev=267285&r1=267284&r2=267285&view=diff
==============================================================================
--- directory/standalone/trunk/osgi/project.xml (original)
+++ directory/standalone/trunk/osgi/project.xml Fri Sep  2 14:26:23 2005
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <pomVersion>3</pomVersion>
-  <groupId>apache</groupId>
+  <groupId>directory-standalone</groupId>
   <distributionSite>http://update.apache.org/</distributionSite>
-  <artifactId>apache-osgi</artifactId>
-  <name>Apache OSGi Services</name>
+  <artifactId>directory-standalone-osgi</artifactId>
+  <name>Apache Directory OSGi Bundles</name>
   <currentVersion>0.1.1</currentVersion>
   <organization>
     <name>Apache</name>
@@ -12,20 +12,20 @@
     <logo>/images/apache-logo.png</logo>
   </organization>
   <inceptionYear>2005</inceptionYear>
-  <package>org.apache.osgi</package>
+  <package>org.apache.directory.osgi</package>
   <issueTrackingUrl>http://issues.apache.org</issueTrackingUrl>
   <logo>http://directory.apache.org/images/apache-directory-logo.png</logo>
-  <url>http://directory.apache.org/subprojects/protocols/kerberos</url>
-  <siteAddress>www.apache.org</siteAddress>
-  <siteDirectory>/www/directory.apache.org/directory/subprojects/protocols/kerberos</siteDirectory>
+  <url>http://directory.apache.org</url>
+  <siteAddress>directory.apache.org</siteAddress>
+  <siteDirectory>/www/directory.apache.org/directory</siteDirectory>
   <distributionDirectory>/www/cvs.apache.org/dist/directory</distributionDirectory>
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory:protocols/kerberos/trunk/${module.path}</connection>
-    <url>http://cvs.apache.org/viewcvs.cgi/incubator/directory/protocols/kerberos/trunk/${module.path}/?root=Apache-SVN</url>
-    <developerConnection>https://svn.apache.org/repos/asf/directory:protocols/kerberos/trunk/${module.path}</developerConnection>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/directory:standalone/trunk/osgi/${module.path}</connection>
+    <url>http://cvs.apache.org/viewcvs.cgi/directory/standalone/trunk/osgi/${module.path}/?root=Apache-SVN</url>
+    <developerConnection>https://svn.apache.org/repos/asf/directory:standalone/trunk/osgi/${module.path}</developerConnection>
   </repository>
-  <shortDescription>Apache OSGi</shortDescription>
-  <description>OSGi services for the Apache server.</description>
+  <shortDescription>Apache Directory OSGi Bundles</shortDescription>
+  <description>OSGi bundles for the Apache Directory server.</description>
   <mailingLists>
     <mailingList>
       <name>Apache Developer List - use [osgi] prefix</name>
@@ -96,6 +96,11 @@
       <url>http://www.osgi.org</url>
     </dependency>
     <dependency>
+      <groupId>directory-network</groupId>
+      <artifactId>mina</artifactId>
+      <version>0.7.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-osgi-plugin</artifactId>
       <version>0.3.5</version>
@@ -141,6 +146,12 @@
           <include>**/*.x*</include>
         </includes>
         <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>${basedir}/..</directory>
+        <includes>
+          <include>log4j.properties</include>
+        </includes>
       </resource>
     </resources>
     <jars />