You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ps...@apache.org on 2004/12/28 05:29:14 UTC
svn commit: r123468 - in incubator/directory/naming/trunk: . config core core/src/java/org/apache/naming core/src/java/org/apache/naming/factory core/src/java/org/apache/naming/java core/src/java/org/apache/naming/resources core/src/test/org/apache/naming core/src/test/org/apache/naming/java core/src/test/org/apache/naming/resources factory factory/src/java/org/apache/naming/factory java java/src java/src/java java/src/java/org java/src/java/org/apache java/src/java/org/apache/naming java/src/java/org/apache/naming/java java/src/test java/src/test/org java/src/test/org/apache java/src/test/org/apache/naming java/src/test/org/apache/naming/java management management/src management/src/java management/src/java/org management/src/java/org/apache management/src/java/org/apache/naming resources resources/src resources/src/java resources/src/java/org resources/src/java/org/apache resources/src/java/org/apache/naming resources/src/java/org/apache/naming/resources resources/src/test resources/src/test/org resources/src/test/org/apache resources/src/test/org/apache/naming resources/src/test/org/apache/naming/resources
Author: psteitz
Date: Mon Dec 27 20:29:12 2004
New Revision: 123468
URL: http://svn.apache.org/viewcvs?view=rev&rev=123468
Log:
Reorganized sources to enable packaging per DIRNAMING-7.
Added:
incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/
incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/Constants.java
- copied unchanged from r123368, incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java
incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/ResourceLinkFactory.java
- copied unchanged from r123428, incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceLinkFactory.java
incubator/directory/naming/trunk/java/
incubator/directory/naming/trunk/java/project.properties
incubator/directory/naming/trunk/java/project.xml
incubator/directory/naming/trunk/java/src/
incubator/directory/naming/trunk/java/src/java/
incubator/directory/naming/trunk/java/src/java/org/
incubator/directory/naming/trunk/java/src/java/org/apache/
incubator/directory/naming/trunk/java/src/java/org/apache/naming/
incubator/directory/naming/trunk/java/src/java/org/apache/naming/java/
- copied from r123368, incubator/directory/naming/trunk/core/src/java/org/apache/naming/java/
incubator/directory/naming/trunk/java/src/test/
incubator/directory/naming/trunk/java/src/test/org/
incubator/directory/naming/trunk/java/src/test/org/apache/
incubator/directory/naming/trunk/java/src/test/org/apache/naming/
incubator/directory/naming/trunk/java/src/test/org/apache/naming/BasicContextTest.java
- copied unchanged from r123387, incubator/directory/naming/trunk/core/src/test/org/apache/naming/BasicContextTest.java
incubator/directory/naming/trunk/java/src/test/org/apache/naming/java/
- copied from r123387, incubator/directory/naming/trunk/core/src/test/org/apache/naming/java/
incubator/directory/naming/trunk/management/
incubator/directory/naming/trunk/management/project.properties
incubator/directory/naming/trunk/management/project.xml
incubator/directory/naming/trunk/management/src/
incubator/directory/naming/trunk/management/src/java/
incubator/directory/naming/trunk/management/src/java/org/
incubator/directory/naming/trunk/management/src/java/org/apache/
incubator/directory/naming/trunk/management/src/java/org/apache/naming/
incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingService.java
- copied unchanged from r123388, incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingService.java
incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingServiceMBean.java
- copied unchanged from r123388, incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingServiceMBean.java
incubator/directory/naming/trunk/resources/
incubator/directory/naming/trunk/resources/project.properties
incubator/directory/naming/trunk/resources/project.xml
incubator/directory/naming/trunk/resources/src/
incubator/directory/naming/trunk/resources/src/java/
incubator/directory/naming/trunk/resources/src/java/org/
incubator/directory/naming/trunk/resources/src/java/org/apache/
incubator/directory/naming/trunk/resources/src/java/org/apache/naming/
incubator/directory/naming/trunk/resources/src/java/org/apache/naming/resources/
- copied from r123368, incubator/directory/naming/trunk/core/src/java/org/apache/naming/resources/
incubator/directory/naming/trunk/resources/src/test/
incubator/directory/naming/trunk/resources/src/test/org/
incubator/directory/naming/trunk/resources/src/test/org/apache/
incubator/directory/naming/trunk/resources/src/test/org/apache/naming/
incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/
- copied from r123387, incubator/directory/naming/trunk/core/src/test/org/apache/naming/resources/
incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/AbstractDirContextTest.java
- copied unchanged from r123458, incubator/directory/naming/trunk/core/src/test/org/apache/naming/resources/AbstractDirContextTest.java
Removed:
incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingService.java
incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingServiceMBean.java
incubator/directory/naming/trunk/core/src/java/org/apache/naming/java/
incubator/directory/naming/trunk/core/src/java/org/apache/naming/resources/
incubator/directory/naming/trunk/core/src/test/org/apache/naming/BasicContextTest.java
incubator/directory/naming/trunk/core/src/test/org/apache/naming/java/
incubator/directory/naming/trunk/core/src/test/org/apache/naming/resources/
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceLinkFactory.java
Modified:
incubator/directory/naming/trunk/config/project.xml
incubator/directory/naming/trunk/core/project.xml
incubator/directory/naming/trunk/factory/project.xml
incubator/directory/naming/trunk/project.xml
incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/FileDirContextTest.java
Modified: incubator/directory/naming/trunk/config/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/config/project.xml?view=diff&rev=123468&p1=incubator/directory/naming/trunk/config/project.xml&r1=123467&p2=incubator/directory/naming/trunk/config/project.xml&r2=123468
==============================================================================
--- incubator/directory/naming/trunk/config/project.xml (original)
+++ incubator/directory/naming/trunk/config/project.xml Mon Dec 27 20:29:12 2004
@@ -36,14 +36,25 @@
<version>1.4.1</version>
</dependency>
- <!-- Runtime dependencies - Digester -->
+ <!-- Runtime dependencies -->
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>directory-naming-java</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
</dependency>
-
- <!-- Runtime dependencies - DBCP factories -->
+
+ <dependency>
+ <id>commons-collections</id>
+ <version>3.1</version>
+ </dependency>
+
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
Modified: incubator/directory/naming/trunk/core/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/core/project.xml?view=diff&rev=123468&p1=incubator/directory/naming/trunk/core/project.xml&r1=123467&p2=incubator/directory/naming/trunk/core/project.xml&r2=123468
==============================================================================
--- incubator/directory/naming/trunk/core/project.xml (original)
+++ incubator/directory/naming/trunk/core/project.xml Mon Dec 27 20:29:12 2004
@@ -3,14 +3,5 @@
<extend>${basedir}/../project.xml</extend>
<id>directory-naming-core</id>
<name>Core</name>
-
- <dependencies>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jmx</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-
</project>
Deleted: /incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingService.java?view=auto&rev=123467
==============================================================================
Deleted: /incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingServiceMBean.java
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingServiceMBean.java?view=auto&rev=123467
==============================================================================
Copied: incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/Constants.java (from r123368, incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/Constants.java?view=diff&rev=123468&p1=incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java&r1=123368&p2=incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/Constants.java&r2=123468
==============================================================================
Copied: incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/ResourceLinkFactory.java (from r123428, incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceLinkFactory.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/ResourceLinkFactory.java?view=diff&rev=123468&p1=incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceLinkFactory.java&r1=123428&p2=incubator/directory/naming/trunk/core/src/java/org/apache/naming/factory/ResourceLinkFactory.java&r2=123468
==============================================================================
Deleted: /incubator/directory/naming/trunk/core/src/test/org/apache/naming/BasicContextTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/core/src/test/org/apache/naming/BasicContextTest.java?view=auto&rev=123467
==============================================================================
Modified: incubator/directory/naming/trunk/factory/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/factory/project.xml?view=diff&rev=123468&p1=incubator/directory/naming/trunk/factory/project.xml&r1=123467&p2=incubator/directory/naming/trunk/factory/project.xml&r2=123468
==============================================================================
--- incubator/directory/naming/trunk/factory/project.xml (original)
+++ incubator/directory/naming/trunk/factory/project.xml Mon Dec 27 20:29:12 2004
@@ -12,63 +12,13 @@
<artifactId>directory-naming-core</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc1</version>
- </dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-javamail</artifactId>
<version>1.3.1-rc1</version>
</dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.4.1</version>
- </dependency>
-
- <!-- Runtime dependencies - Digester -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
- </dependency>
-
- <!-- Runtime dependencies - DBCP factories -->
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <!-- Test dependencies - used to test database connection factories -->
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
+
+ </dependencies>
</project>
Deleted: /incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java?view=auto&rev=123467
==============================================================================
Deleted: /incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceLinkFactory.java
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceLinkFactory.java?view=auto&rev=123467
==============================================================================
Added: incubator/directory/naming/trunk/java/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/java/project.properties?view=auto&rev=123468
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/java/project.properties Mon Dec 27 20:29:12 2004
@@ -0,0 +1,5 @@
+maven.checkstyle.properties=${basedir}/../checkstyle.xml
+maven.checkstyle.header.file=${basedir}/../LICENSE.txt
+maven.multiproject.type=jar
+
+module.path=java
Added: incubator/directory/naming/trunk/java/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/java/project.xml?view=auto&rev=123468
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/java/project.xml Mon Dec 27 20:29:12 2004
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<project>
+ <extend>${basedir}/../project.xml</extend>
+ <id>directory-naming-java</id>
+ <name>Naming Java</name>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>directory-naming-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ </dependencies>
+</project>
+
Copied: incubator/directory/naming/trunk/java/src/test/org/apache/naming/BasicContextTest.java (from r123387, incubator/directory/naming/trunk/core/src/test/org/apache/naming/BasicContextTest.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/java/src/test/org/apache/naming/BasicContextTest.java?view=diff&rev=123468&p1=incubator/directory/naming/trunk/core/src/test/org/apache/naming/BasicContextTest.java&r1=123387&p2=incubator/directory/naming/trunk/java/src/test/org/apache/naming/BasicContextTest.java&r2=123468
==============================================================================
Added: incubator/directory/naming/trunk/management/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/management/project.properties?view=auto&rev=123468
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/management/project.properties Mon Dec 27 20:29:12 2004
@@ -0,0 +1,5 @@
+maven.checkstyle.properties=${basedir}/../checkstyle.xml
+maven.checkstyle.header.file=${basedir}/../LICENSE.txt
+maven.multiproject.type=jar
+
+module.path=management
Added: incubator/directory/naming/trunk/management/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/management/project.xml?view=auto&rev=123468
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/management/project.xml Mon Dec 27 20:29:12 2004
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<project>
+ <extend>${basedir}/../project.xml</extend>
+ <id>directory-naming-management</id>
+ <name>Naming Management</name>
+
+ <dependencies>
+
+ <!-- Compile time dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>directory-naming-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <!-- Run time dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>directory-naming-java</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ </dependencies>
+
+</project>
+
Copied: incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingService.java (from r123388, incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingService.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingService.java?view=diff&rev=123468&p1=incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingService.java&r1=123388&p2=incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingService.java&r2=123468
==============================================================================
Copied: incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingServiceMBean.java (from r123388, incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingServiceMBean.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingServiceMBean.java?view=diff&rev=123468&p1=incubator/directory/naming/trunk/core/src/java/org/apache/naming/NamingServiceMBean.java&r1=123388&p2=incubator/directory/naming/trunk/management/src/java/org/apache/naming/NamingServiceMBean.java&r2=123468
==============================================================================
Modified: incubator/directory/naming/trunk/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/project.xml?view=diff&rev=123468&p1=incubator/directory/naming/trunk/project.xml&r1=123467&p2=incubator/directory/naming/trunk/project.xml&r2=123468
==============================================================================
--- incubator/directory/naming/trunk/project.xml (original)
+++ incubator/directory/naming/trunk/project.xml Mon Dec 27 20:29:12 2004
@@ -5,7 +5,7 @@
<name>directory-naming</name>
<id>directory-naming</id>
<groupId>directory-naming</groupId>
- <currentVersion>SNAPSHOT</currentVersion>
+ <currentVersion>0.8</currentVersion>
<organization>
<name>Apache Software Foundation</name>
@@ -84,21 +84,11 @@
</developer>
</developers>
-
- <!-- Need to mark these as compile-time/run-time -->
-
- <dependencies>
-
- <dependency>
- <id>commons-collections</id>
- <version>2.1</version>
- </dependency>
-
+ <dependencies>
<dependency>
<id>junit</id>
<version>3.8.1</version>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
Added: incubator/directory/naming/trunk/resources/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/resources/project.properties?view=auto&rev=123468
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/resources/project.properties Mon Dec 27 20:29:12 2004
@@ -0,0 +1,5 @@
+maven.checkstyle.properties=${basedir}/../checkstyle.xml
+maven.checkstyle.header.file=${basedir}/../LICENSE.txt
+maven.multiproject.type=jar
+
+module.path=resources
Added: incubator/directory/naming/trunk/resources/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/resources/project.xml?view=auto&rev=123468
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/resources/project.xml Mon Dec 27 20:29:12 2004
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<project>
+ <extend>${basedir}/../project.xml</extend>
+ <id>directory-naming-resources</id>
+ <name>Naming Resources</name>
+ <dependencies>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>directory-naming-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-collections</id>
+ <version>3.1</version>
+ </dependency>
+ </dependencies>
+</project>
+
Copied: incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/AbstractDirContextTest.java (from r123458, incubator/directory/naming/trunk/core/src/test/org/apache/naming/resources/AbstractDirContextTest.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/AbstractDirContextTest.java?view=diff&rev=123468&p1=incubator/directory/naming/trunk/core/src/test/org/apache/naming/resources/AbstractDirContextTest.java&r1=123458&p2=incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/AbstractDirContextTest.java&r2=123468
==============================================================================
Modified: incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/FileDirContextTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/FileDirContextTest.java?view=diff&rev=123468&p1=incubator/directory/naming/trunk/core/src/test/org/apache/naming/resources/FileDirContextTest.java&r1=123387&p2=incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/FileDirContextTest.java&r2=123468
==============================================================================
--- incubator/directory/naming/trunk/core/src/test/org/apache/naming/resources/FileDirContextTest.java (original)
+++ incubator/directory/naming/trunk/resources/src/test/org/apache/naming/resources/FileDirContextTest.java Mon Dec 27 20:29:12 2004
@@ -25,8 +25,6 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.Attributes;
-import org.apache.naming.resources.ResourceAttributes;
-
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;