Author: jeff.yuchang Date: 2013-01-11 02:57:00 -0500 (Fri, 11 Jan 2013) New Revision: 1597 Modified: dsp/branches/DSP-1.0.x/api/pom.xml dsp/branches/DSP-1.0.x/distribution/pom.xml dsp/branches/DSP-1.0.x/integration/jbossas5/pom.xml dsp/branches/DSP-1.0.x/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigImpl.java dsp/branches/DSP-1.0.x/integration/jbossas6/pom.xml dsp/branches/DSP-1.0.x/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigImpl.java dsp/branches/DSP-1.0.x/integration/pom.xml dsp/branches/DSP-1.0.x/integration/tomcat/pom.xml dsp/branches/DSP-1.0.x/pom.xml Log: RIFTSAW-519: updated the node name. Modified: dsp/branches/DSP-1.0.x/api/pom.xml =================================================================== --- dsp/branches/DSP-1.0.x/api/pom.xml 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/api/pom.xml 2013-01-11 07:57:00 UTC (rev 1597) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-api</artifactId> <packaging>jar</packaging> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> <name>SOA::DSP::API</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> </parent> <dependencies> Modified: dsp/branches/DSP-1.0.x/distribution/pom.xml =================================================================== --- dsp/branches/DSP-1.0.x/distribution/pom.xml 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/distribution/pom.xml 2013-01-11 07:57:00 UTC (rev 1597) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>distribution</artifactId> <packaging>pom</packaging> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> <name>SOA::DSP::Distribution</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> </parent> <properties> Modified: dsp/branches/DSP-1.0.x/integration/jbossas5/pom.xml =================================================================== --- dsp/branches/DSP-1.0.x/integration/jbossas5/pom.xml 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/integration/jbossas5/pom.xml 2013-01-11 07:57:00 UTC (rev 1597) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-jbossas5</artifactId> <packaging>jar</packaging> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> <name>SOA::DSP::Integration::JBossAS5</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> </parent> <properties> Modified: dsp/branches/DSP-1.0.x/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigImpl.java =================================================================== --- dsp/branches/DSP-1.0.x/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigImpl.java 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jbossas5/JBossServerConfigImpl.java 2013-01-11 07:57:00 UTC (rev 1597) @@ -234,7 +234,7 @@ public String getClusterNodeName() { if (this.clusterNodeName == null || "".equals(this.clusterNodeName.trim())) { - return nonClusteredServerName; + return getDefaultNodeName(); } return this.clusterNodeName; } @@ -244,6 +244,10 @@ } + public String getDefaultNodeName() { + return this.getWebServiceHost() + ":" + this.getWebServicePort(); + } + public String getUddiNodeName() { return this.getWebServiceHost() + "-" + this.getWebServicePort(); } Modified: dsp/branches/DSP-1.0.x/integration/jbossas6/pom.xml =================================================================== --- dsp/branches/DSP-1.0.x/integration/jbossas6/pom.xml 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/integration/jbossas6/pom.xml 2013-01-11 07:57:00 UTC (rev 1597) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-jbossas6</artifactId> <packaging>jar</packaging> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> <name>SOA::DSP::Integration::JBossAS6</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> </parent> <properties> Modified: dsp/branches/DSP-1.0.x/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigImpl.java =================================================================== --- dsp/branches/DSP-1.0.x/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigImpl.java 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/integration/jbossas6/src/main/java/org/jboss/soa/dsp/server/jbossas6/JBossServerConfigImpl.java 2013-01-11 07:57:00 UTC (rev 1597) @@ -234,7 +234,7 @@ public String getClusterNodeName() { if (this.clusterNodeName == null || "".equals(this.clusterNodeName.trim())) { - return nonClusteredServerName; + return getDefaultNodeName(); } return this.clusterNodeName; } @@ -243,6 +243,9 @@ this.clusterNodeName = clusterNodeName; } + public String getDefaultNodeName() { + return this.getWebServiceHost() + ":" + this.getWebServicePort(); + } public String getUddiNodeName() { return this.getWebServiceHost() + "-" + this.getWebServicePort(); Modified: dsp/branches/DSP-1.0.x/integration/pom.xml =================================================================== --- dsp/branches/DSP-1.0.x/integration/pom.xml 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/integration/pom.xml 2013-01-11 07:57:00 UTC (rev 1597) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> <packaging>pom</packaging> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> <name>SOA::DSP::Integration</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modules> Modified: dsp/branches/DSP-1.0.x/integration/tomcat/pom.xml =================================================================== --- dsp/branches/DSP-1.0.x/integration/tomcat/pom.xml 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/integration/tomcat/pom.xml 2013-01-11 07:57:00 UTC (rev 1597) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-tomcat</artifactId> <packaging>jar</packaging> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> <name>SOA::DSP::Integration::Tomcat</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> </parent> <dependencies> Modified: dsp/branches/DSP-1.0.x/pom.xml =================================================================== --- dsp/branches/DSP-1.0.x/pom.xml 2013-01-03 01:29:51 UTC (rev 1596) +++ dsp/branches/DSP-1.0.x/pom.xml 2013-01-11 07:57:00 UTC (rev 1597) @@ -5,7 +5,7 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> <packaging>pom</packaging> - <version>1.1.0.Final</version> + <version>1.2.0-SNAPSHOT</version> <name>SOA::DSP</name> <url>http://www.jboss.org/riftsaw</url> <description>DSP</description> @@ -38,7 +38,7 @@ </licenses> <properties> - <dsp.version>1.1.0.Final</dsp.version> + <dsp.version>1.2.0-SNAPSHOT</dsp.version> <junit.version>4.8.1</junit.version> <jaxws.version>2.1</jaxws.version> <wsdl4j.version>1.6.2</wsdl4j.version>