You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2007/09/27 18:14:56 UTC
svn commit: r580077 - in /geronimo/server:
branches/2.0/configs/jaxws-deployer/
branches/2.0/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/
trunk/configs/jaxws-deployer/
trunk/modules/geronimo-deploy-tool/src/main/java/o...
Author: vamsic007
Date: Thu Sep 27 09:14:55 2007
New Revision: 580077
URL: http://svn.apache.org/viewvc?rev=580077&view=rev
Log:
GERONIMO-3481 Offline deployer throws BIND Exception when port 1099 is in use
o Change the scope of jaxws-deployer's dependency on webservices-common to runtime.
o Prevent offline deployer from stopping the onlineConfigStores as it will leave no stores for the offline deployer to work with.
Modified:
geronimo/server/branches/2.0/configs/jaxws-deployer/pom.xml
geronimo/server/branches/2.0/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
geronimo/server/trunk/configs/jaxws-deployer/pom.xml
geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
Modified: geronimo/server/branches/2.0/configs/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/jaxws-deployer/pom.xml?rev=580077&r1=580076&r2=580077&view=diff
==============================================================================
--- geronimo/server/branches/2.0/configs/jaxws-deployer/pom.xml (original)
+++ geronimo/server/branches/2.0/configs/jaxws-deployer/pom.xml Thu Sep 27 09:14:55 2007
@@ -47,6 +47,7 @@
<artifactId>webservices-common</artifactId>
<type>car</type>
<version>${version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
Modified: geronimo/server/branches/2.0/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java?rev=580077&r1=580076&r2=580077&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java Thu Sep 27 09:14:55 2007
@@ -70,7 +70,7 @@
startOfflineConfiguration(offlineDeployerArtifact);
startPersistentOfflineConfigurations(offlineDeployerArtifact);
stopOfflineConfigurationManager();
- stopOnlineConfigStores();
+ //stopOnlineConfigStores(); // If we stop the stores here, we are left with no stores to work with!!
enablePersistentConfigurationTracking();
} catch (Exception e) {
throw new DeploymentException("Unexpected error. Cannot start offline-deployer", e);
Modified: geronimo/server/trunk/configs/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jaxws-deployer/pom.xml?rev=580077&r1=580076&r2=580077&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jaxws-deployer/pom.xml Thu Sep 27 09:14:55 2007
@@ -119,11 +119,33 @@
<useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
+ <value>false</value>
</useMavenDependencies>
<category>Web Services</category>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>webservices-common</artifactId>
+ <type>car</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jaxws-builder</artifactId>
+ <version>${version}</version>
+ <import>classes</import>
+ </dependency>
+ </dependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java?rev=580077&r1=580076&r2=580077&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java Thu Sep 27 09:14:55 2007
@@ -70,7 +70,7 @@
startOfflineConfiguration(offlineDeployerArtifact);
startPersistentOfflineConfigurations(offlineDeployerArtifact);
stopOfflineConfigurationManager();
- stopOnlineConfigStores();
+ //stopOnlineConfigStores(); // If we stop the stores here, we are left with no stores to work with!!
enablePersistentConfigurationTracking();
} catch (Exception e) {
throw new DeploymentException("Unexpected error. Cannot start offline-deployer", e);