You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/25 11:02:57 UTC
svn commit: r436726 [3/4] - in /geronimo/server/trunk: ./
applications/console/ applications/console/console-core/
applications/console/console-core/src/java/
applications/console/console-core/src/main/
applications/console/console-core/src/main/java/ ...
Modified: geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml Fri Aug 25 02:02:39 2006
@@ -33,6 +33,7 @@
<packaging>war</packaging>
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.applications.magicGball</groupId>
<artifactId>magicGball-ejb</artifactId>
@@ -44,6 +45,7 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/applications/magicGball/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/applications/magicGball/pom.xml (original)
+++ geronimo/server/trunk/applications/magicGball/pom.xml Fri Aug 25 02:02:39 2006
@@ -34,6 +34,7 @@
<packaging>pom</packaging>
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
@@ -63,6 +64,7 @@
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+
</dependencies>
<modules>
Modified: geronimo/server/trunk/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/pom.xml Fri Aug 25 02:02:39 2006
@@ -53,6 +53,7 @@
</scm>
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
@@ -70,6 +71,7 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</dependency>
+
</dependencies>
<build>
Added: geronimo/server/trunk/applications/uddi-db/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-db/LICENSE.txt?rev=436726&view=auto
==============================================================================
--- geronimo/server/trunk/applications/uddi-db/LICENSE.txt (added)
+++ geronimo/server/trunk/applications/uddi-db/LICENSE.txt Fri Aug 25 02:02:39 2006
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange: geronimo/server/trunk/applications/uddi-db/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/applications/uddi-db/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/applications/uddi-db/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/applications/uddi-db/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-db/NOTICE.txt?rev=436726&view=auto
==============================================================================
--- geronimo/server/trunk/applications/uddi-db/NOTICE.txt (added)
+++ geronimo/server/trunk/applications/uddi-db/NOTICE.txt Fri Aug 25 02:02:39 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: geronimo/server/trunk/applications/uddi-db/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/applications/uddi-db/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/applications/uddi-db/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/uddi-db/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/applications/uddi-db/pom.xml (original)
+++ geronimo/server/trunk/applications/uddi-db/pom.xml Fri Aug 25 02:02:39 2006
@@ -99,7 +99,7 @@
<onError>abort</onError>
<delimiter>;</delimiter>
<srcFiles>
- <srcFile>${pom.basedir}/src/sql/juddi.sql</srcFile>
+ <srcFile>${pom.basedir}/src/main/sql/juddi.sql</srcFile>
</srcFiles>
</configuration>
</execution>
Modified: geronimo/server/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/activemq-embedded-rar/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/server/trunk/modules/activemq-embedded-rar/pom.xml Fri Aug 25 02:02:39 2006
@@ -47,19 +47,8 @@
<url>http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar</url>
</scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-rar-plugin</artifactId>
- <configuration>
- <raXmlFile>${basedir}/src/rar/META-INF/ra.xml</raXmlFile>
- <includeJar>false</includeJar>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
+
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-core</artifactId>
@@ -69,7 +58,19 @@
<groupId>activemq</groupId>
<artifactId>activemq-ra</artifactId>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-rar-plugin</artifactId>
+ <configuration>
+ <includeJar>false</includeJar>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<!--
HACK: Currently need to pickup the Codehaus m1 repo for activemq-*:3.2.4-SNAPSHOT
Modified: geronimo/server/trunk/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/activemq-gbean-management/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/server/trunk/modules/activemq-gbean-management/pom.xml Fri Aug 25 02:02:39 2006
@@ -58,11 +58,5 @@
</dependency>
</dependencies>
-
- <build>
- <!-- FIXME: Remove when the default is to use the m2 standard layout -->
- <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
- <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
- </build>
</project>
Modified: geronimo/server/trunk/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/activemq-gbean/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/activemq-gbean/pom.xml (original)
+++ geronimo/server/trunk/modules/activemq-gbean/pom.xml Fri Aug 25 02:02:39 2006
@@ -94,12 +94,6 @@
</dependency>
</dependencies>
-
- <build>
- <!-- FIXME: Remove when the default is to use the m2 standard layout -->
- <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
- <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
- </build>
<!--
HACK: Need the Apache m1 snapshot repo to pick up incubator-activemq:*
Modified: geronimo/server/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/axis-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/axis-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -119,20 +119,16 @@
<artifactId>wsdl4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
- <resources>
- <!-- This schema is NOT compiled to xmlobjects. Do not remove! Used by SchemaInfoBuilder -->
- <resource>
- <directory>src/schema</directory>
- <includes>
- <include>soap_encoding_1_1.xsd</include>
- </includes>
- <targetPath>META-INF/schema</targetPath>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ParsingTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ParsingTest.java (original)
+++ geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ParsingTest.java Fri Aug 25 02:02:39 2006
@@ -25,7 +25,8 @@
import java.net.URI;
import java.net.URISyntaxException;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.SchemaTypeSystem;
@@ -38,27 +39,28 @@
/**
* @version $Rev$ $Date$
*/
-public class ParsingTest extends TestCase {
- private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
+public class ParsingTest
+ extends TestSupport
+{
private SchemaInfoBuilder schemaInfoBuilder;
public void testSchema1() throws Exception {
- File schema1 = new File(basedir, "src/test-resources/schema/schema1.xsd");
- System.out.println("SCHEMA 1");
+ File schema1 = new File(BASEDIR, "src/test/resources/schema/schema1.xsd");
+ log.debug("SCHEMA 1");
Map map = parse(schema1);
assertEquals(13, map.size());
}
public void testSchema2() throws Exception {
- File schema1 = new File(basedir, "src/test-resources/schema/schema2.xsd");
- System.out.println("SCHEMA 2");
+ File schema1 = new File(BASEDIR, "src/test/resources/schema/schema2.xsd");
+ log.debug("SCHEMA 2");
Map map = parse(schema1);
assertEquals(4, map.size());
}
public void testSchema3() throws Exception {
- File schema1 = new File(basedir, "src/test-resources/schema/schema3.xsd");
- System.out.println("SCHEMA 3");
+ File schema1 = new File(BASEDIR, "src/test/resources/schema/schema3.xsd");
+ log.debug("SCHEMA 3");
Map map = parse(schema1);
assertEquals(3, map.size());
}
@@ -83,30 +85,30 @@
Map map = schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap();
for (Iterator iterator = map.entrySet().iterator(); iterator.hasNext();) {
Map.Entry entry = (Map.Entry) iterator.next();
- System.out.println(entry.getKey() + " --> " + entry.getValue());
+ log.debug(entry.getKey() + " --> " + entry.getValue());
}
return map;
}
public void testElementToTypeMapping() throws Exception {
- File schema1 = new File(basedir, "src/test-resources/schema/schema4.xsd");
- System.out.println("SCHEMA 4");
+ File schema1 = new File(BASEDIR, "src/test/resources/schema/schema4.xsd");
+ log.debug("SCHEMA 4");
Map map = parse(schema1);
assertEquals(3, map.size());
Map elements = schemaInfoBuilder.getElementToTypeMap();
- System.out.println("ELEMENT MAP");
- System.out.println(elements);
+ log.debug("ELEMENT MAP");
+ log.debug(elements);
assertEquals(1, elements.size());
}
public void testAnyElements() throws Exception {
- File schema1 = new File(basedir, "src/test-resources/schema/schema5.xsd");
- System.out.println("SCHEMA 5");
+ File schema1 = new File(BASEDIR, "src/test/resources/schema/schema5.xsd");
+ log.debug("SCHEMA 5");
Map map = parse(schema1);
assertEquals(8, map.size());
Map elements = schemaInfoBuilder.getElementToTypeMap();
- System.out.println("ELEMENT MAP");
- System.out.println(elements);
+ log.debug("ELEMENT MAP");
+ log.debug(elements);
assertEquals(4, elements.size());
}
Modified: geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java (original)
+++ geronimo/server/trunk/modules/axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java Fri Aug 25 02:02:39 2006
@@ -47,7 +47,8 @@
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.axis.constants.Style;
import org.apache.axis.soap.SOAPConstants;
import org.apache.geronimo.axis.builder.bookquote.BookQuote;
@@ -83,9 +84,9 @@
/**
* @version $Rev:385232 $ $Date$
*/
-public class ServiceReferenceTest extends TestCase {
- private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
-
+public class ServiceReferenceTest
+ extends TestSupport
+{
public final static String NAMESPACE = "http://geronimo.apache.org/axis/mock";
private File tmpbasedir;
private Environment environment = new Environment();
@@ -93,7 +94,7 @@
private DeploymentContext context;
private ClassLoader isolatedCl = new URLClassLoader(new URL[0], this.getClass().getClassLoader());
private final String operationName = "doMockOperation";
- private final File wsdlDir = new File(basedir, "src/test-resources/interop");
+ private final File wsdlDir = new File(BASEDIR, "src/test/resources/interop");
private final File wsdlFile = new File(wsdlDir, "interop.wsdl");
private List handlerInfos = new ArrayList();
private GerServiceRefType gerServiceRefType = null;
@@ -187,12 +188,12 @@
}
public void testBuildBookQuoteProxy() throws Exception {
- File wsdl = new File(basedir, "src/test-resources/BookQuote.wsdl");
+ File wsdl = new File(BASEDIR, "src/test/resources/BookQuote.wsdl");
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader reader = factory.newWSDLReader();
Definition definition = reader.readWSDL(wsdl.toURI().toString());
SchemaInfoBuilder schemaInfoBuilder = new SchemaInfoBuilder(null, definition);
- File jaxrpcMapping = new File(basedir, "src/test-resources/BookQuote.xml");
+ File jaxrpcMapping = new File(BASEDIR, "src/test/resources/BookQuote.xml");
JavaWsdlMappingDocument mappingDocument = JavaWsdlMappingDocument.Factory.parse(jaxrpcMapping);
JavaWsdlMappingType mapping = mappingDocument.getJavaWsdlMapping();
QName serviceQName = new QName("http://www.Monson-Haefel.com/jwsbook/BookQuote", "BookQuoteService");
@@ -214,7 +215,7 @@
WSDLReader reader = factory.newWSDLReader();
Definition definition = reader.readWSDL(wsdlFile.toURI().toString());
SchemaInfoBuilder schemaInfoBuilder = new SchemaInfoBuilder(null, definition);
- File jaxrpcMapping = new File(basedir, "src/test-resources/interop/interop-jaxrpcmapping.xml");
+ File jaxrpcMapping = new File(BASEDIR, "src/test/resources/interop/interop-jaxrpcmapping.xml");
JavaWsdlMappingDocument mappingDocument = JavaWsdlMappingDocument.Factory.parse(jaxrpcMapping);
JavaWsdlMappingType mapping = mappingDocument.getJavaWsdlMapping();
QName serviceQName = new QName("http://tempuri.org/4s4c/1/3/wsdl/def/interopLab", "interopLab");
@@ -229,11 +230,11 @@
private void testInteropPort(InteropTestPortType interopTestPort) throws java.rmi.RemoteException {
if (runExternalWSTest) {
- System.out.println("Running external ws test");
+ log.debug("Running external ws test");
int result = interopTestPort.echoInteger(1);
assertEquals(result, 1);
} else {
- System.out.println("Skipping external ws test");
+ log.debug("Skipping external ws test");
}
}
@@ -335,7 +336,6 @@
return mapping;
}
-
private void recursiveDelete(File file) {
if (file.isDirectory()) {
File[] files = file.listFiles();
@@ -345,5 +345,4 @@
}
file.delete();
}
-
}
Modified: geronimo/server/trunk/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/axis/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/axis/pom.xml (original)
+++ geronimo/server/trunk/modules/axis/pom.xml Fri Aug 25 02:02:39 2006
@@ -48,6 +48,7 @@
</scm>
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
@@ -122,15 +123,15 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/resources2</directory>
- </resource>
- </resources>
- </build>
</project>
Modified: geronimo/server/trunk/modules/axis/src/test/java/org/apache/geronimo/axis/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/axis/src/test/java/org/apache/geronimo/axis/AbstractTestCase.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/axis/src/test/java/org/apache/geronimo/axis/AbstractTestCase.java (original)
+++ geronimo/server/trunk/modules/axis/src/test/java/org/apache/geronimo/axis/AbstractTestCase.java Fri Aug 25 02:02:39 2006
@@ -18,41 +18,31 @@
import java.io.File;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
/**
* Abstract base class for test cases.
+ *
* @version $Rev$ $Date$
*/
public abstract class AbstractTestCase
- extends TestCase {
- protected String testDir = "src/test/";
- protected String sampleDir = "src/samples/";
+ extends TestSupport
+{
+ protected String testDir = "src/main/test/";
+ protected String sampleDir = "src/main/test/samples/";
protected String outDir = "target/generated/samples/";
protected String tempDir = "target/generated/temp";
- /**
- * Basedir for all file I/O. Important when running tests from
- * the reactor.
- */
- public String basedir = System.getProperty("basedir");
-
+
/**
* Constructor.
*/
public AbstractTestCase(String testName) {
super(testName);
- if (basedir == null) {
- basedir = new File(".").getAbsolutePath();
- if (!(basedir.endsWith("axis")
- || basedir.endsWith("axis\\")
- || basedir.endsWith("axis/"))) {
- basedir = new File("./modules/axis/").getAbsolutePath();
- }
- }
- testDir = new File(basedir, testDir).getAbsolutePath();
- sampleDir = new File(basedir, sampleDir).getAbsolutePath();
- outDir = new File(basedir, outDir).getAbsolutePath();
- tempDir = new File(basedir, tempDir).getAbsolutePath();
+
+ testDir = new File(BASEDIR, testDir).getAbsolutePath();
+ sampleDir = new File(BASEDIR, sampleDir).getAbsolutePath();
+ outDir = new File(BASEDIR, outDir).getAbsolutePath();
+ tempDir = new File(BASEDIR, tempDir).getAbsolutePath();
}
/**
@@ -61,7 +51,7 @@
* @param path Path to test input file.
*/
public String getTestFile(String path) {
- return new File(basedir, path).getAbsolutePath();
+ return new File(BASEDIR, path).getAbsolutePath();
}
public void testDummy() throws Exception {
Modified: geronimo/server/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/client-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/client-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -66,16 +66,17 @@
<artifactId>geronimo-security-builder</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/resources2</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: geronimo/server/trunk/modules/client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/server/trunk/modules/client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java Fri Aug 25 02:02:39 2006
@@ -2,7 +2,8 @@
import java.io.File;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientDocument;
import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
@@ -13,17 +14,16 @@
/**
*/
-public class PlanParsingTest extends TestCase {
+public class PlanParsingTest extends TestSupport {
private AppClientModuleBuilder builder;
- File basedir = new File(System.getProperty("basedir", "."));
protected void setUp() throws Exception {
builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, null, null, null, null, null);
}
public void testResourceRef() throws Exception {
- File resourcePlan = new File(basedir, "src/test-resources/plans/plan1.xml");
+ File resourcePlan = new File(BASEDIR, "src/test/resources/plans/plan1.xml");
assertTrue(resourcePlan.exists());
GerApplicationClientType appClient = builder.getGeronimoAppClient(resourcePlan, null, true, null, null, null);
assertEquals(1, appClient.getResourceRefArray().length);
@@ -44,11 +44,11 @@
ref.setResourceLink("target");
XmlBeansUtil.validateDD(appClient);
-// System.out.println(appClient.toString());
+ // System.out.println(appClient.toString());
}
public void testConnectorInclude() throws Exception {
- File resourcePlan = new File(basedir, "src/test-resources/plans/plan2.xml");
+ File resourcePlan = new File(BASEDIR, "src/test/resources/plans/plan2.xml");
assertTrue(resourcePlan.exists());
GerApplicationClientType appClient = builder.getGeronimoAppClient(resourcePlan, null, true, null, null, null);
assertEquals(1, appClient.getResourceRefArray().length);
Modified: geronimo/server/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/client/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/client/pom.xml (original)
+++ geronimo/server/trunk/modules/client/pom.xml Fri Aug 25 02:02:39 2006
@@ -88,5 +88,6 @@
</dependency>
</dependencies>
+
</project>
Modified: geronimo/server/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/connector-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/connector-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -80,20 +80,16 @@
<artifactId>tranql</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
- <resources>
- <!-- TODO this should not be needed -->
- <!--<resource>-->
- <!--<directory>${pom.basedir}/src/schema</directory>-->
- <!--<targetPath>META-INF</targetPath>-->
- <!--<includes>-->
- <!--<include>geronimo-connector-1.2.xsd</include>-->
- <!--</includes>-->
- <!--</resource>-->
- </resources>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -112,7 +108,7 @@
<phase>process-test-resources</phase>
<configuration>
<tasks>
- <ant antfile="${pom.basedir}/src/test/test-setup.xml"/>
+ <ant antfile="${pom.basedir}/src/test/script/test-setup.xml"/>
</tasks>
</configuration>
<goals>
Modified: geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Fri Aug 25 02:02:39 2006
@@ -38,7 +38,8 @@
import javax.sql.DataSource;
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.ModuleIDBuilder;
@@ -88,8 +89,8 @@
/**
* @version $Rev:385232 $ $Date$
*/
-public class ConnectorModuleBuilderTest extends TestCase {
- private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
+public class ConnectorModuleBuilderTest extends TestSupport {
+
private boolean defaultXATransactionCaching = true;
private boolean defaultXAThreadCaching = false;
private int defaultMaxSize = 10;
@@ -164,7 +165,7 @@
public void testBuildEar() throws Exception {
JarFile rarFile = null;
try {
- rarFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear-noger.ear"));
+ rarFile = DeploymentUtil.createJarFile(new File(BASEDIR, "target/test-ear-noger.ear"));
GBeanBuilder serviceBuilder = new GBeanBuilder(null, null);
// EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, transactionContextManagerName, connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()), null, null, ejbReferenceBuilder, null,
EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment,
@@ -191,7 +192,7 @@
ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
try {
- File planFile = new File(basedir, "src/test-data/data/external-application-plan.xml");
+ File planFile = new File(BASEDIR, "src/test/data/data/external-application-plan.xml");
ModuleIDBuilder idBuilder = new ModuleIDBuilder();
Object plan = configBuilder.getDeploymentPlan(planFile, rarFile, idBuilder);
context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, rarFile, idBuilder), plan, rarFile, Collections.singleton(configurationStore), artifactResolver, configurationStore);
@@ -216,7 +217,7 @@
public void testBuildUnpackedModule() throws Exception {
InstallAction action = new InstallAction() {
public File getRARFile() {
- return new File(basedir, "target/test-rar-10");
+ return new File(BASEDIR, "target/test-rar-10");
}
};
executeTestBuildModule(action, false);
@@ -225,15 +226,15 @@
public void testBuildUnpackedAltSpecDDModule() throws Exception {
InstallAction action = new InstallAction() {
public File getVendorDD() {
- return new File(basedir, "target/test-rar-10/META-INF/geronimo-ra.xml");
+ return new File(BASEDIR, "target/test-rar-10/META-INF/geronimo-ra.xml");
}
public URL getSpecDD() throws MalformedURLException {
- return new File(basedir, "target/test-rar-10/dummy.xml").toURL();
+ return new File(BASEDIR, "target/test-rar-10/dummy.xml").toURL();
}
public File getRARFile() {
- return new File(basedir, "target/test-rar-10");
+ return new File(BASEDIR, "target/test-rar-10");
}
};
try {
@@ -247,15 +248,15 @@
InstallAction action = new InstallAction() {
public File getVendorDD() {
// this file does not exist, one expects a DeploymentException.
- return new File(basedir, "target/test-rar-10/dummy.xml");
+ return new File(BASEDIR, "target/test-rar-10/dummy.xml");
}
public URL getSpecDD() throws MalformedURLException {
- return new File(basedir, "target/test-rar-10/META-INF/ra.xml").toURL();
+ return new File(BASEDIR, "target/test-rar-10/META-INF/ra.xml").toURL();
}
public File getRARFile() {
- return new File(basedir, "target/test-rar-10");
+ return new File(BASEDIR, "target/test-rar-10");
}
};
try {
@@ -269,15 +270,15 @@
InstallAction action = new InstallAction() {
public File getVendorDD() {
// this file exists
- return new File(basedir, "target/test-rar-10/META-INF/geronimo-ra.xml");
+ return new File(BASEDIR, "target/test-rar-10/META-INF/geronimo-ra.xml");
}
public URL getSpecDD() throws MalformedURLException {
- return new File(basedir, "target/test-rar-10/META-INF/ra.xml").toURL();
+ return new File(BASEDIR, "target/test-rar-10/META-INF/ra.xml").toURL();
}
public File getRARFile() {
- return new File(basedir, "target/test-rar-10");
+ return new File(BASEDIR, "target/test-rar-10");
}
};
executeTestBuildModule(action, false);
@@ -286,7 +287,7 @@
public void testBuildPackedModule() throws Exception {
InstallAction action = new InstallAction() {
public File getRARFile() {
- return new File(basedir, "target/test-rar-10.rar");
+ return new File(BASEDIR, "target/test-rar-10.rar");
}
};
executeTestBuildModule(action, false);
@@ -295,7 +296,7 @@
//1.5 tests
public void testBuildUnpackedModule15() throws Exception {
InstallAction action = new InstallAction() {
- private File rarFile = new File(basedir, "target/test-rar-15");
+ private File rarFile = new File(BASEDIR, "target/test-rar-15");
public File getRARFile() {
return rarFile;
@@ -308,7 +309,7 @@
public void testBuildPackedModule15() throws Exception {
InstallAction action = new InstallAction() {
- private File rarFile = new File(basedir, "target/test-rar-15.rar");
+ private File rarFile = new File(BASEDIR, "target/test-rar-15.rar");
public File getRARFile() {
return rarFile;
@@ -320,7 +321,7 @@
public void testBuildPackedModule15LocalTx() throws Exception {
InstallAction action = new InstallAction() {
- private File rarFile = new File(basedir, "target/test-rar-15-localtx.rar");
+ private File rarFile = new File(BASEDIR, "target/test-rar-15-localtx.rar");
public File getRARFile() {
return rarFile;
@@ -337,7 +338,7 @@
public void testBuildPackedModule15NoTx() throws Exception {
InstallAction action = new InstallAction() {
- private File rarFile = new File(basedir, "target/test-rar-15-notx.rar");
+ private File rarFile = new File(BASEDIR, "target/test-rar-15-notx.rar");
public File getRARFile() {
return rarFile;
Modified: geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java Fri Aug 25 02:02:39 2006
@@ -5,7 +5,8 @@
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
@@ -16,11 +17,9 @@
/**
*/
-public class PlanParsingTest extends TestCase {
+public class PlanParsingTest extends TestSupport {
private final static QName CONNECTOR_QNAME = GerConnectorDocument.type.getDocumentElementName();
private ClassLoader classLoader = this.getClass().getClassLoader();
-
- File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
public void testLoadGeronimoDeploymentDescriptor10() throws Exception {
URL srcXml = classLoader.getResource("connector_1_0/geronimo-ra.xml");
Modified: geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java (original)
+++ geronimo/server/trunk/modules/connector-builder/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java Fri Aug 25 02:02:39 2006
@@ -30,7 +30,8 @@
import javax.enterprise.deploy.spi.DConfigBeanRoot;
import javax.enterprise.deploy.spi.DeploymentConfiguration;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.connector.deployment.dconfigbean.ConfigPropertySettings;
import org.apache.geronimo.connector.deployment.dconfigbean.ConnectionDefinitionDConfigBean;
import org.apache.geronimo.connector.deployment.dconfigbean.ConnectionDefinitionInstance;
@@ -47,7 +48,7 @@
* @version $Rev$ $Date$
*
* */
-public class RAR_1_0DConfigBeanTest extends TestCase {
+public class RAR_1_0DConfigBeanTest extends TestSupport {
private URL j2eeDD;
XmlOptions xmlOptions;
private List errors;
@@ -108,7 +109,7 @@
}
protected void XsetUp() throws Exception {
- File docDir = new File("src/test-data/connector_1_0");
+ File docDir = new File(BASEDIR, "src/test/data/connector_1_0");
j2eeDD = new File(docDir, "ra.xml").toURL();
xmlOptions = new XmlOptions();
xmlOptions.setLoadLineNumbers();
Copied: geronimo/server/trunk/modules/connector-builder/src/test/script/test-setup.xml (from r434494, geronimo/server/trunk/modules/connector-builder/src/test/test-setup.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/connector-builder/src/test/script/test-setup.xml?p2=geronimo/server/trunk/modules/connector-builder/src/test/script/test-setup.xml&p1=geronimo/server/trunk/modules/connector-builder/src/test/test-setup.xml&r1=434494&r2=436726&rev=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/connector-builder/src/test/test-setup.xml (original)
+++ geronimo/server/trunk/modules/connector-builder/src/test/script/test-setup.xml Fri Aug 25 02:02:39 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,24 +19,24 @@
<project name="test-setup" default="default" basedir=".">
- <target name="default">
- <!-- Build test-rar-10 -->
- <mkdir dir="${basedir}/target/test-rar-10/META-INF"/>
- <copy todir="${basedir}/target/test-rar-10/META-INF">
- <fileset dir="${basedir}/src/test-data/connector_1_0"/>
- </copy>
- <jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
-
- <!-- Build test-rar-15 -->
- <mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
- <copy todir="${basedir}/target/test-rar-15/META-INF">
- <fileset dir="${basedir}/src/test-data/connector_1_5"/>
- </copy>
- <jar destfile="${basedir}/target/test-rar-15.rar" basedir="${basedir}/target/test-rar-15"/>
-
- <mkdir dir="${basedir}/target/test-rar-15-notx/META-INF"/>
+ <target name="default">
+ <!-- Build test-rar-10 -->
+ <mkdir dir="${basedir}/target/test-rar-10/META-INF"/>
+ <copy todir="${basedir}/target/test-rar-10/META-INF">
+ <fileset dir="${basedir}/src/test/data/connector_1_0"/>
+ </copy>
+ <jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
+
+ <!-- Build test-rar-15 -->
+ <mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
+ <copy todir="${basedir}/target/test-rar-15/META-INF">
+ <fileset dir="${basedir}/src/test/data/connector_1_5"/>
+ </copy>
+ <jar destfile="${basedir}/target/test-rar-15.rar" basedir="${basedir}/target/test-rar-15"/>
+
+ <mkdir dir="${basedir}/target/test-rar-15-notx/META-INF"/>
<copy todir="${basedir}/target/test-rar-15-notx/META-INF">
- <fileset dir="${basedir}/src/test-data/connector_1_5_notx"/>
+ <fileset dir="${basedir}/src/test/data/connector_1_5_notx"/>
</copy>
<jar destfile="${basedir}/target/test-rar-15-notx.rar"
@@ -46,49 +45,50 @@
<mkdir dir="${basedir}/target/test-rar-15-localtx/META-INF"/>
<copy todir="${basedir}/target/test-rar-15-localtx/META-INF">
- <fileset dir="${basedir}/src/test-data/connector_1_5_localtx"/>
+ <fileset dir="${basedir}/src/test/data/connector_1_5_localtx"/>
</copy>
<jar destfile="${basedir}/target/test-rar-15-localtx.rar"
basedir="${basedir}/target/test-rar-15-localtx"/>
- <!-- Build test-ear -->
- <jar destfile="${basedir}/target/test-ear.ear">
- <fileset dir="${basedir}/target">
- <include name="test-rar-10.rar"/>
- <include name="test-rar-15.rar"/>
- </fileset>
- <zipfileset dir="${basedir}/src/test-data/ear" prefix="META-INF"/>
- </jar>
- <!--do it again without geronimo dds-->
- <!-- Build test-rar-10 -->
- <mkdir dir="${basedir}/target/test-rar-10-noger/META-INF"/>
- <copy todir="${basedir}/target/test-rar-10-noger/META-INF">
- <fileset dir="${basedir}/src/test-data/connector_1_0">
- <exclude name="geronimo-ra.xml"/>
- </fileset>
- </copy>
- <jar destfile="${basedir}/target/test-rar-10-noger.rar" basedir="${basedir}/target/test-rar-10"/>
-
- <!-- Build test-rar-15 -->
- <mkdir dir="${basedir}/target/test-rar-15-noger/META-INF"/>
- <copy todir="${basedir}/target/test-rar-15-noger/META-INF">
- <fileset dir="${basedir}/src/test-data/connector_1_5">
- <exclude name="geronimo-ra.xml"/>
- </fileset>
- </copy>
- <jar destfile="${basedir}/target/test-rar-15-noger.rar" basedir="${basedir}/target/test-rar-15"/>
-
- <!-- Build test-ear -->
- <jar destfile="${basedir}/target/test-ear-noger.ear">
- <fileset dir="${basedir}/target">
- <include name="test-rar-10-noger.rar"/>
- <include name="test-rar-15-noger.rar"/>
- </fileset>
- <zipfileset dir="${basedir}/src/test-data/ear" prefix="META-INF">
- <exclude name="geronimo-application.xml"/>
- </zipfileset>
- </jar>
+ <!-- Build test-ear -->
+ <jar destfile="${basedir}/target/test-ear.ear">
+ <fileset dir="${basedir}/target">
+ <include name="test-rar-10.rar"/>
+ <include name="test-rar-15.rar"/>
+ </fileset>
+ <zipfileset dir="${basedir}/src/test/data/ear" prefix="META-INF"/>
+ </jar>
+
+ <!--do it again without geronimo dds-->
+ <!-- Build test-rar-10 -->
+ <mkdir dir="${basedir}/target/test-rar-10-noger/META-INF"/>
+ <copy todir="${basedir}/target/test-rar-10-noger/META-INF">
+ <fileset dir="${basedir}/src/test/data/connector_1_0">
+ <exclude name="geronimo-ra.xml"/>
+ </fileset>
+ </copy>
+ <jar destfile="${basedir}/target/test-rar-10-noger.rar" basedir="${basedir}/target/test-rar-10"/>
- </target>
+ <!-- Build test-rar-15 -->
+ <mkdir dir="${basedir}/target/test-rar-15-noger/META-INF"/>
+ <copy todir="${basedir}/target/test-rar-15-noger/META-INF">
+ <fileset dir="${basedir}/src/test/data/connector_1_5">
+ <exclude name="geronimo-ra.xml"/>
+ </fileset>
+ </copy>
+ <jar destfile="${basedir}/target/test-rar-15-noger.rar" basedir="${basedir}/target/test-rar-15"/>
+
+ <!-- Build test-ear -->
+ <jar destfile="${basedir}/target/test-ear-noger.ear">
+ <fileset dir="${basedir}/target">
+ <include name="test-rar-10-noger.rar"/>
+ <include name="test-rar-15-noger.rar"/>
+ </fileset>
+ <zipfileset dir="${basedir}/src/test/data/ear" prefix="META-INF">
+ <exclude name="geronimo-application.xml"/>
+ </zipfileset>
+ </jar>
+ </target>
+
</project>
Modified: geronimo/server/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/converter/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/converter/pom.xml (original)
+++ geronimo/server/trunk/modules/converter/pom.xml Fri Aug 25 02:02:39 2006
@@ -60,5 +60,6 @@
</dependency>
</dependencies>
+
</project>
Modified: geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java (original)
+++ geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java Fri Aug 25 02:02:39 2006
@@ -24,7 +24,7 @@
import org.apache.geronimo.gbean.AbstractName;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public interface NamespaceDrivenBuilder {
void build(XmlObject container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException;
Modified: geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java (original)
+++ geronimo/server/trunk/modules/deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java Fri Aug 25 02:02:39 2006
@@ -30,7 +30,7 @@
import org.apache.xmlbeans.XmlObject;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class NamespaceDrivenBuilderCollection {
Modified: geronimo/server/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/directory/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/directory/pom.xml (original)
+++ geronimo/server/trunk/modules/directory/pom.xml Fri Aug 25 02:02:39 2006
@@ -171,12 +171,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/resources2</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -184,7 +178,7 @@
<configuration>
<sourceSchemas>directory.xsd</sourceSchemas>
<outputDirectory>${pom.basedir}/target/classes/schemaorg_apache_xmlbeans</outputDirectory>
- <defaultXmlConfigDir>${pom.basedir}/src/schema/xmlconfig.xml</defaultXmlConfigDir>
+ <defaultXmlConfigDir>${pom.basedir}/src/main/schema/xmlconfig.xml</defaultXmlConfigDir>
</configuration>
</plugin>
@@ -222,7 +216,9 @@
<configuration>
<tasks>
<tstamp/>
- <copy todir="target/var/" file="src/test-resources/directory.xml"/>
+ <mkdir dir="${pom.basedir}/target/var"/>
+ <copy file="${pom.basedir}/src/test/resources/directory.xml"
+ todir="${pom.basedir}/target/var"/>
</tasks>
</configuration>
</execution>
Modified: geronimo/server/trunk/modules/interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/interceptor/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/interceptor/pom.xml (original)
+++ geronimo/server/trunk/modules/interceptor/pom.xml Fri Aug 25 02:02:39 2006
@@ -46,10 +46,4 @@
<url>http://svn.apache.org/viewvc/geronimo/trunk/modules/interceptor</url>
</scm>
- <build>
- <!-- FIXME: Remove when the default is to use the m2 standard layout -->
- <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
- <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
- </build>
-
</project>
Modified: geronimo/server/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/j2ee-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/j2ee-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -70,6 +70,29 @@
</dependencies>
<build>
+ <!--
+ FIXME: Convert module to m2 standard layout
+ -->
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test-data</directory>
+ </testResource>
+
+ <testResource>
+ <directory>src/test-resources</directory>
+ </testResource>
+ </testResources>
+
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -123,6 +146,13 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
<configuration>
+ <!--
+ FIXME: Remove when using m2 layout
+ -->
+ <schemaDirectory>${pom.basedir}/src/schema</schemaDirectory>
+ <xmlConfigs>
+ <xmlConfig implementation="java.io.File">${pom.basedir}/src/schema/xmlconfig.xml</xmlConfig>
+ </xmlConfigs>
<sourceSchemas>geronimo-application-1.2.xsd</sourceSchemas>
</configuration>
</plugin>
Modified: geronimo/server/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/j2ee-schema/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/modules/j2ee-schema/pom.xml Fri Aug 25 02:02:39 2006
@@ -74,6 +74,29 @@
</dependencies>
<build>
+ <!--
+ FIXME: Convert module to m2 standard layout
+ -->
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test-data</directory>
+ </testResource>
+
+ <testResource>
+ <directory>src/test-resources</directory>
+ </testResource>
+ </testResources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: geronimo/server/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/jetty-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/jetty-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -60,7 +60,14 @@
<artifactId>geronimo-jetty</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Fri Aug 25 02:02:39 2006
@@ -34,7 +34,8 @@
import javax.naming.Reference;
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
import org.apache.geronimo.deployment.DeploymentContext;
@@ -91,7 +92,8 @@
/**
* @version $Rev:385232 $ $Date$
*/
-public class JettyModuleBuilderTest extends TestCase {
+public class JettyModuleBuilderTest extends TestSupport {
+
private static Naming naming = new Jsr77Naming();
private Artifact baseId = new Artifact("test", "base", "1", "car");
private final AbstractName serverName = naming.createRootName(baseId, "Server", "J2EEServer");
@@ -101,18 +103,17 @@
private AbstractName ctcName;
private ClassLoader cl;
private JettyModuleBuilder builder;
- private File basedir = new File(System.getProperty("basedir", "."));
private Artifact webModuleArtifact = new Artifact("foo", "bar", "1", "car");
private Environment defaultEnvironment = new Environment();
private ConfigurationManager configurationManager;
private ConfigurationStore configStore;
public void testDeployWar4() throws Exception {
- File outputPath = new File(basedir, "target/test-resources/deployables/war4");
+ File outputPath = new File(BASEDIR, "target/test-resources/deployables/war4");
recursiveDelete(outputPath);
outputPath.mkdirs();
new File(outputPath, "war").mkdir();
- File path = new File(basedir, "src/test-resources/deployables/war4");
+ File path = new File(BASEDIR, "src/test/resources/deployables/war4");
UnpackedJarFile jarFile = new UnpackedJarFile(path);
Module module = builder.createModule(null, jarFile, kernel.getNaming(), new ModuleIDBuilder());
Repository repository = null;
@@ -133,7 +134,7 @@
assertEquals(State.RUNNING_INDEX, kernel.getGBeanState(moduleName));
Set names = configuration.findGBeans(new AbstractNameQuery(moduleName.getArtifact(), Collections.EMPTY_MAP));
- System.out.println("names: " + names);
+ log.debug("names: " + names);
for (Iterator iterator = names.iterator(); iterator.hasNext();) {
AbstractName objectName = (AbstractName) iterator.next();
assertEquals(State.RUNNING_INDEX, kernel.getGBeanState(objectName));
@@ -145,11 +146,11 @@
}
public void testContextRootWithSpaces() throws Exception {
- File outputPath = new File(basedir, "target/test-resources/deployables/war-spaces-in-context");
+ File outputPath = new File(BASEDIR, "target/test-resources/deployables/war-spaces-in-context");
recursiveDelete(outputPath);
outputPath.mkdirs();
new File(outputPath, "war").mkdir();
- File path = new File(basedir, "src/test-resources/deployables/war-spaces-in-context");
+ File path = new File(BASEDIR, "src/test/resources/deployables/war-spaces-in-context");
UnpackedJarFile jarFile = new UnpackedJarFile(path);
Module module = builder.createModule(null, jarFile, kernel.getNaming(), new ModuleIDBuilder());
Repository repository = null;
Modified: geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java Fri Aug 25 02:02:39 2006
@@ -1,6 +1,7 @@
package org.apache.geronimo.jetty.deployment;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.deployment.util.UnpackedJarFile;
import org.apache.geronimo.deployment.xbeans.ArtifactType;
import org.apache.geronimo.deployment.xbeans.EnvironmentType;
@@ -38,7 +39,8 @@
/**
*/
-public class PlanParsingTest extends TestCase {
+public class PlanParsingTest extends TestSupport {
+
private ClassLoader classLoader = this.getClass().getClassLoader();
private Naming naming = new Jsr77Naming();
@@ -83,7 +85,7 @@
assertTrue(resourcePlan != null);
JettyWebAppType jettyWebApp = builder.getJettyWebApp(new File(resourcePlan.getFile()), null, true, null, null);
// assertEquals(4, jettyWebApp.getSecurity().getRoleMappings().getRoleArray().length);
-// System.out.println(jettyWebApp.xmlText());
+// log.debug(jettyWebApp.xmlText());
}
public void testOldFormat() throws Exception {
@@ -121,7 +123,7 @@
ref.setResourceLink("target");
XmlBeansUtil.validateDD(webApp);
- System.out.println(webApp.toString());
+ log.debug(webApp.toString());
}
private void addEnvironment(JettyWebAppType webApp) {
Modified: geronimo/server/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/jetty/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/jetty/pom.xml (original)
+++ geronimo/server/trunk/modules/jetty/pom.xml Fri Aug 25 02:02:39 2006
@@ -106,15 +106,16 @@
<artifactId>commons-primitives</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/resources2</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -122,7 +123,7 @@
<systemProperties>
<property>
<name>java.security.auth.login.config</name>
- <value>${basedir}/src/test-resources/data/login.config</value>
+ <value>${basedir}/src/test/resources/data/login.config</value>
</property>
</systemProperties>
</configuration>
Modified: geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java Fri Aug 25 02:02:39 2006
@@ -27,7 +27,8 @@
import javax.transaction.TransactionManager;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
import org.apache.geronimo.jetty.connector.HTTPConnector;
@@ -53,9 +54,7 @@
/**
* @version $Rev$ $Date$
*/
-public class AbstractWebModuleTest extends TestCase {
- private File basedir = new File(System.getProperty("basedir", "."));
-
+public class AbstractWebModuleTest extends TestSupport {
protected ClassLoader cl;
protected final static String securityRealmName = "demo-properties-realm";
private HTTPConnector connector;
@@ -155,8 +154,8 @@
new SecurityServiceImpl(cl, serverInfo, "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory", "org.apache.geronimo.security.jacc.GeronimoPolicy", null, null, null, null);
Properties options = new Properties();
- options.setProperty("usersURI", new File(basedir, "src/test-resources/data/users.properties").toURI().toString());
- options.setProperty("groupsURI", new File(basedir, "src/test-resources/data/groups.properties").toURI().toString());
+ options.setProperty("usersURI", new File(BASEDIR, "src/test/resources/data/users.properties").toURI().toString());
+ options.setProperty("groupsURI", new File(BASEDIR, "src/test/resources/data/groups.properties").toURI().toString());
LoginModuleGBean loginModule = new LoginModuleGBean("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule", null, true, true, cl);
loginModule.setLoginDomainName(domainName);
Modified: geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java (original)
+++ geronimo/server/trunk/modules/jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java Fri Aug 25 02:02:39 2006
@@ -21,7 +21,8 @@
import java.net.MalformedURLException;
import java.net.URL;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.kernel.config.MultiParentClassLoader;
import org.apache.geronimo.kernel.repository.Artifact;
@@ -32,9 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public class ClassLoaderTest extends TestCase {
- private File basedir = new File(System.getProperty("basedir"));
-
+public class ClassLoaderTest extends TestSupport {
Artifact configId = new Artifact("foo", "bar", "1", "car");
ClassLoader cl;
URL[] urls;
@@ -43,7 +42,7 @@
public void setUp() throws Exception {
super.setUp();
- URL url = new File(basedir, "src/test-resources/deployables/cltest/").toURL();
+ URL url = new File(BASEDIR, "src/test/resources/deployables/cltest/").toURL();
urls = new URL[]{url};
}
Modified: geronimo/server/trunk/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/kernel/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/kernel/pom.xml (original)
+++ geronimo/server/trunk/modules/kernel/pom.xml Fri Aug 25 02:02:39 2006
@@ -85,16 +85,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/META-INF</directory>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
- </build>
</project>
Modified: geronimo/server/trunk/modules/kernel/src/test/java/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/kernel/src/test/java/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/kernel/src/test/java/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java (original)
+++ geronimo/server/trunk/modules/kernel/src/test/java/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java Fri Aug 25 02:02:39 2006
@@ -30,13 +30,12 @@
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
/**
* @version $Rev$ $Date$
*/
-public class UrlResourceFinderTest extends TestCase {
- private File basedir = new File(System.getProperty("basedir"));
+public class UrlResourceFinderTest extends TestSupport {
private File jarFile;
private Manifest manifest;
private Attributes resourceAttributes;
@@ -50,8 +49,8 @@
* @throws Exception
*/
public void testResourceEnumeration() throws Exception {
- URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
- URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
+ URL jar1 = new File(BASEDIR, "src/test/data/resourceFinderTest/jar1/").toURL();
+ URL jar2 = new File(BASEDIR, "src/test/data/resourceFinderTest/jar2/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[]{jar1, jar2});
Enumeration enumeration = resourceFinder.findResources("resource");
@@ -73,7 +72,7 @@
}
public void testDirectoryResource() throws Exception {
- URL jar = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar = new File(BASEDIR, "src/test/data/resourceFinderTest/jar1/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[]{jar});
ResourceHandle resource = resourceFinder.getResource("resource");
@@ -151,7 +150,7 @@
}
public void testAddURL() throws Exception {
- URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar1 = new File(BASEDIR, "src/test/data/resourceFinderTest/jar1/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[]{jar1});
Enumeration enumeration = resourceFinder.findResources("resource");
@@ -165,7 +164,7 @@
assertFalse(enumeration.hasMoreElements());
// addUrl
- URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
+ URL jar2 = new File(BASEDIR, "src/test/data/resourceFinderTest/jar2/").toURL();
resourceFinder.addUrl(jar2);
// getResource should find the first jar only
@@ -198,8 +197,8 @@
}
public void testConcurrentAddURL() throws Exception {
- URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
- URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
+ URL jar1 = new File(BASEDIR, "src/test/data/resourceFinderTest/jar1/").toURL();
+ URL jar2 = new File(BASEDIR, "src/test/data/resourceFinderTest/jar2/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[]{jar1, jar2});
Enumeration enumeration = resourceFinder.findResources("resource");
@@ -242,7 +241,7 @@
}
public void testDirectoryDestroy() throws Exception {
- URL jar = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar = new File(BASEDIR, "src/test/data/resourceFinderTest/jar1/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[]{jar});
assertDestroyed(resourceFinder, "resource1", null);
}
@@ -447,7 +446,7 @@
resourceAttributes.putValue("drink", "margarita");
manifest.getEntries().put("resource", resourceAttributes);
- File targetDir = new File(basedir, "target");
+ File targetDir = new File(BASEDIR, "target");
jarFile = new File(targetDir, "resourceFinderTest.jar");
JarOutputStream jarOutputStream = new JarOutputStream(new FileOutputStream(jarFile), manifest);
jarOutputStream.putNextEntry(new ZipEntry("resource"));
@@ -457,7 +456,7 @@
IoUtil.close(jarOutputStream);
alternateJarFile = new File(targetDir, "alternate.jar");
- System.out.println(alternateJarFile.getAbsolutePath());
+ log.debug(alternateJarFile.getAbsolutePath());
jarOutputStream = new JarOutputStream(new FileOutputStream(alternateJarFile), manifest);
jarOutputStream.putNextEntry(new ZipEntry("resource"));
jarOutputStream.write("resource4".getBytes());
Modified: geronimo/server/trunk/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/naming-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/naming-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -108,6 +108,13 @@
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/security-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -66,7 +66,14 @@
<artifactId>geronimo-service-builder</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/modules/security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/pom.xml (original)
+++ geronimo/server/trunk/modules/security/pom.xml Fri Aug 25 02:02:39 2006
@@ -103,6 +103,13 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-testsupport</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -114,7 +121,7 @@
<systemProperties>
<property>
<name>java.security.auth.login.config</name>
- <value>${pom.basedir}/src/test-data/data/login.config</value>
+ <value>${pom.basedir}/src/test/data/data/login.config</value>
</property>
</systemProperties>
Modified: geronimo/server/trunk/modules/security/src/main/java/org/apache/geronimo/security/Callers.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/src/main/java/org/apache/geronimo/security/Callers.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/src/main/java/org/apache/geronimo/security/Callers.java (original)
+++ geronimo/server/trunk/modules/security/src/main/java/org/apache/geronimo/security/Callers.java Fri Aug 25 02:02:39 2006
@@ -20,7 +20,7 @@
import javax.security.auth.Subject;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class Callers {
Modified: geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/AbstractTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/AbstractTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/AbstractTest.java (original)
+++ geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/AbstractTest.java Fri Aug 25 02:02:39 2006
@@ -17,7 +17,8 @@
package org.apache.geronimo.security;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -51,7 +52,7 @@
/**
* @version $Rev$ $Date$
*/
-public abstract class AbstractTest extends TestCase {
+public abstract class AbstractTest extends TestSupport {
protected Kernel kernel;
protected AbstractName serverInfo;
protected AbstractName loginService;