You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/09/05 14:58:22 UTC
svn commit: r440336 [3/3] - in /geronimo/server/branches/sachin: ./
applications/geronimo-uddi-server/ applications/geronimo-welcome/
configs/client-corba/ configs/client-deployer/ configs/client-security/
configs/client-system/ configs/client/ maven-p...
Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Tue Sep 5 05:58:05 2006
@@ -1,22 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
*
- * 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.
+ * 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.
*/
-
package org.apache.geronimo.j2ee.deployment;
import junit.framework.Assert;
@@ -31,6 +28,7 @@
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
import javax.management.ObjectName;
import javax.naming.Reference;
@@ -47,18 +45,18 @@
private ClassLoader cl;
public Module connectorModule;
- public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "rar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
return new ConnectorModule(true, moduleName, null, moduleFile, "connector", null, null, null);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
return new ConnectorModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
}
- public void installModule(JarFile earFile, EARContext earContext, Module connectorModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
+ public void installModule(DeployableModule earFile, EARContext earContext, Module connectorModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
assertNotNull(earFile);
assertNotNull(earContext);
this.earContext = earContext;
Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Tue Sep 5 05:58:05 2006
@@ -1,22 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
*
- * 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.
+ * 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.
*/
-
package org.apache.geronimo.j2ee.deployment;
import junit.framework.Assert;
@@ -30,6 +27,7 @@
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
import javax.naming.Reference;
import java.io.File;
@@ -47,18 +45,18 @@
private ClassLoader cl;
public EJBModule ejbModule;
- public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName earName = naming.createRootName(new Artifact("test", "test-ejb-jar", "", "jar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
return new EJBModule(true, moduleName, null, moduleFile, "ejb.jar", null, null, null);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
return new EJBModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
}
- public void installModule(JarFile earFile, EARContext earContext, Module ejbModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
+ public void installModule(DeployableModule earFile, EARContext earContext, Module ejbModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
assertNotNull(earFile);
assertNotNull(earContext);
this.earContext = earContext;
Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Tue Sep 5 05:58:05 2006
@@ -1,22 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
*
- * 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.
+ * 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.
*/
-
package org.apache.geronimo.j2ee.deployment;
import junit.framework.Assert;
@@ -28,6 +25,7 @@
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
import java.io.File;
import java.net.URL;
@@ -46,18 +44,18 @@
public WebModule webModule;
public String contextRoot;
- public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "war"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
return new WebModule(true, moduleName, null, moduleFile, "war", null, null, null, contextRoot, portMap, namespace);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
return new WebModule(false, moduleName, null, moduleFile, targetPath, null, null, null, contextRoot, portMap, namespace);
}
- public void installModule(JarFile earFile, EARContext earContext, Module webModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
+ public void installModule(DeployableModule earFile, EARContext earContext, Module webModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
assertNotNull(earFile);
assertNotNull(earContext);
this.earContext = earContext;
Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml Tue Sep 5 05:58:05 2006
@@ -71,13 +71,6 @@
<version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee/pom.xml Tue Sep 5 05:58:05 2006
@@ -50,13 +50,6 @@
<artifactId>geronimo-ejb_2.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-jetty-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-jetty-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-jetty-builder/pom.xml Tue Sep 5 05:58:05 2006
@@ -45,13 +45,6 @@
<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/branches/sachin/modules/geronimo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-jetty/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-jetty/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-jetty/pom.xml Tue Sep 5 05:58:05 2006
@@ -92,13 +92,6 @@
<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>
Modified: geronimo/server/branches/sachin/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-jmx-remoting/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-jmx-remoting/pom.xml Tue Sep 5 05:58:05 2006
@@ -48,13 +48,6 @@
<artifactId>mx4j-remote</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-kernel/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-kernel/pom.xml Tue Sep 5 05:58:05 2006
@@ -69,13 +69,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-mail/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-mail/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-mail/pom.xml Tue Sep 5 05:58:05 2006
@@ -66,13 +66,6 @@
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-management/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-management/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-management/pom.xml Tue Sep 5 05:58:05 2006
@@ -48,13 +48,6 @@
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-naming-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-naming-builder/pom.xml Tue Sep 5 05:58:05 2006
@@ -91,13 +91,6 @@
<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/branches/sachin/modules/geronimo-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-naming/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-naming/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-naming/pom.xml Tue Sep 5 05:58:05 2006
@@ -50,13 +50,6 @@
<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>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-security-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-security-builder/pom.xml Tue Sep 5 05:58:05 2006
@@ -51,13 +51,6 @@
<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/branches/sachin/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-security/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-security/pom.xml Tue Sep 5 05:58:05 2006
@@ -83,13 +83,6 @@
<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>
Modified: geronimo/server/branches/sachin/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-service-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-service-builder/pom.xml Tue Sep 5 05:58:05 2006
@@ -55,13 +55,6 @@
<artifactId>geronimo-deploy-config</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>
<dependency>
<groupId>xmlbeans</groupId>
Modified: geronimo/server/branches/sachin/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-system/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-system/pom.xml Tue Sep 5 05:58:05 2006
@@ -72,13 +72,6 @@
<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>
Modified: geronimo/server/branches/sachin/modules/geronimo-test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-test-ddbean/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-test-ddbean/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-test-ddbean/pom.xml Tue Sep 5 05:58:05 2006
@@ -50,13 +50,6 @@
<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>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-timer/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-timer/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-timer/pom.xml Tue Sep 5 05:58:05 2006
@@ -93,13 +93,6 @@
<artifactId>concurrent</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/pom.xml Tue Sep 5 05:58:05 2006
@@ -123,13 +123,6 @@
<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>
Modified: geronimo/server/branches/sachin/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-tomcat/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-tomcat/pom.xml Tue Sep 5 05:58:05 2006
@@ -229,13 +229,6 @@
<artifactId>wadi-tomcat55</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/branches/sachin/modules/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-transaction/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-transaction/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-transaction/pom.xml Tue Sep 5 05:58:05 2006
@@ -70,13 +70,6 @@
<artifactId>howl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-upgrade/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-upgrade/pom.xml Tue Sep 5 05:58:05 2006
@@ -51,13 +51,6 @@
<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>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-util/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-util/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-util/pom.xml Tue Sep 5 05:58:05 2006
@@ -38,13 +38,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-web-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-web-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-web-builder/pom.xml Tue Sep 5 05:58:05 2006
@@ -76,13 +76,6 @@
<artifactId>geronimo-servlet_2.4_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/branches/sachin/modules/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-webservices/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-webservices/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-webservices/pom.xml Tue Sep 5 05:58:05 2006
@@ -96,13 +96,6 @@
<artifactId>scout</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-testsupport</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/branches/sachin/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/pom.xml Tue Sep 5 05:58:05 2006
@@ -33,8 +33,18 @@
<name>Geronimo :: Modules</name>
<packaging>pom</packaging>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<modules>
- <module>geronimo-testsupport</module>
<module>geronimo-activation</module>
<module>ge-activemq-rar</module>
<module>geronimo-activemq-gbean</module>
Modified: geronimo/server/branches/sachin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/pom.xml (original)
+++ geronimo/server/branches/sachin/pom.xml Tue Sep 5 05:58:05 2006
@@ -92,12 +92,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>1.0.1</version>
</dependency>
@@ -917,6 +911,54 @@
</archive>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <version>${pom.version}</version>
+
+ <configuration>
+ <assemblies>
+ <assembly>
+ <id>jetty</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-jetty-j2ee</artifactId>
+ <version>${pom.version}</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+
+ <assembly>
+ <id>jetty-minimal</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-jetty-minimal</artifactId>
+ <version>${pom.version}</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+
+ <assembly>
+ <id>tomcat</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-tomcat-j2ee</artifactId>
+ <version>${pom.version}</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+
+ <assembly>
+ <id>tomcat-minimal</id>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-tomcat-minimal</artifactId>
+ <version>${pom.version}</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </assembly>
+ </assemblies>
+
+ <defaultAssemblyId>jetty</defaultAssemblyId>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -1023,6 +1065,7 @@
</activation>
<modules>
+ <module>testsupport</module>
<module>modules</module>
<module>maven-plugins</module>
<module>applications</module>
@@ -1030,7 +1073,35 @@
<module>assemblies</module>
</modules>
</profile>
+
+ <!--
+ NOTE: This profile is used to enable plugin prefixes for easy command-line usage, as in:
+
+ mvn -Ptools geronimo:start
+ -->
+ <profile>
+ <id>tools</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>maven-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!--
NOTE: The staged build is used to get around a problem with Maven
and extension plugins.
@@ -1055,6 +1126,7 @@
includes most modules, so for now just build everything.
Fix this when the modules are reorganized.
-->
+ <module>testsupport</module>
<module>modules</module>
<module>maven-plugins</module>
</modules>
@@ -1088,6 +1160,7 @@
</activation>
<modules>
+ <module>testsupport</module>
<module>modules</module>
<module>maven-plugins</module>
<module>applications</module>
@@ -1112,6 +1185,7 @@
</activation>
<modules>
+ <module>testsupport</module>
<module>modules</module>
<module>maven-plugins</module>
<module>applications</module>