You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/25 06:11:15 UTC
cvs commit: avalon-sandbox/merlin/merlin-extensions/merlin-servlet project.xml
mcconnell 2003/06/24 21:11:15
Modified: merlin/merlin-extensions/merlin-jndi project.xml
merlin/merlin-extensions/merlin-jndi-new project.xml
merlin/merlin-extensions/merlin-jndi-new/src/test/org/apache/avalon/merlin/jndi
JNDITestCase.java
merlin/merlin-extensions/merlin-servlet project.xml
Log:
Housekeeping.
Revision Changes Path
1.2 +63 -9 avalon-sandbox/merlin/merlin-extensions/merlin-jndi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jndi/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 13 Mar 2003 01:05:21 -0000 1.1
+++ project.xml 25 Jun 2003 04:11:15 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../project.xml</extend>
<groupId>merlin</groupId>
<id>merlin-jndi</id>
<name>Merlin JNDI Gateway</name>
@@ -15,13 +15,67 @@
The gateway package contains a JNDI object factory through which a Merlin Kernel can be established.
</description>
- <developers>
- <developer>
- <name>Stephen McConnell</name>
- <id>mcconnell</id>
- <email>mcconnell@apache.org</email>
- <organization>OSM SARL</organization>
- </developer>
- </developers>
+ <build>
+
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*TestCase*</include>
+ </includes>
+ <excludes>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.xinfo</include>
+ <include>**/*.xtype</include>
+ <include>**/*.xprofile</include>
+ <include>**/*.xconfig</include>
+ <include>**/*.xml</include>
+ <include>**/*.xservice</include>
+ <include>**/*.mf</include>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <integrationUnitTestPatterns></integrationUnitTestPatterns>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.xinfo</include>
+ <include>**/*.xtype</include>
+ <include>**/*.xprofile</include>
+ <include>**/*.xconfig</include>
+ <include>**/*.xml</include>
+ <include>**/*.xservice</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <jars></jars>
+ </build>
</project>
1.3 +1 -64 avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 24 Jun 2003 21:57:35 -0000 1.2
+++ project.xml 25 Jun 2003 04:11:15 -0000 1.3
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../project.xml</extend>
<id>merlin-jndi-new</id>
<name>Merlin JNDI Provider</name>
@@ -16,67 +16,4 @@
<!-- none -->
</dependencies>
- <build>
-
- <sourceDirectory>${basedir}/src/main</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*TestCase*</include>
- </includes>
- <excludes>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.dtd</include>
- <include>**/*.properties</include>
- <include>**/*.xinfo</include>
- <include>**/*.xtype</include>
- <include>**/*.xprofile</include>
- <include>**/*.xconfig</include>
- <include>**/*.xml</include>
- <include>**/*.xservice</include>
- <include>**/*.mf</include>
- <include>**/*.jar</include>
- </includes>
- </resource>
- <resource>
- <directory>${maven.conf.dir}</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <integrationUnitTestPatterns></integrationUnitTestPatterns>
-
- <resources>
- <resource>
- <directory>${basedir}/src/main</directory>
- <includes>
- <include>**/*.dtd</include>
- <include>**/*.properties</include>
- <include>**/*.xinfo</include>
- <include>**/*.xtype</include>
- <include>**/*.xprofile</include>
- <include>**/*.xconfig</include>
- <include>**/*.xml</include>
- <include>**/*.xservice</include>
- </includes>
- </resource>
- <resource>
- <directory>${maven.conf.dir}</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
-
- <jars></jars>
- </build>
-
</project>
1.3 +0 -1 avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/src/test/org/apache/avalon/merlin/jndi/JNDITestCase.java
Index: JNDITestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/src/test/org/apache/avalon/merlin/jndi/JNDITestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JNDITestCase.java 24 Jun 2003 21:43:38 -0000 1.2
+++ JNDITestCase.java 25 Jun 2003 04:11:15 -0000 1.3
@@ -82,7 +82,6 @@
environment.put(
Context.URL_PKG_PREFIXES,
"block://localhost/" );
-
}
public void testInitialContext() throws Exception
1.5 +64 -1 avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 23 Jun 2003 02:37:49 -0000 1.4
+++ project.xml 25 Jun 2003 04:11:15 -0000 1.5
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../project.xml</extend>
<groupId>merlin</groupId>
<id>merlin-servlet</id>
<name>Merlin Kernel Servlet</name>
@@ -189,4 +189,67 @@
</dependencies>
+ <build>
+
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*TestCase*</include>
+ </includes>
+ <excludes>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.xinfo</include>
+ <include>**/*.xtype</include>
+ <include>**/*.xprofile</include>
+ <include>**/*.xconfig</include>
+ <include>**/*.xml</include>
+ <include>**/*.xservice</include>
+ <include>**/*.mf</include>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <integrationUnitTestPatterns></integrationUnitTestPatterns>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.xinfo</include>
+ <include>**/*.xtype</include>
+ <include>**/*.xprofile</include>
+ <include>**/*.xconfig</include>
+ <include>**/*.xml</include>
+ <include>**/*.xservice</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <jars></jars>
+ </build>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org