Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed properties rhcloud.jboss.* -> jboss.*

This commit is contained in:
Andrew Phillips 2012-05-01 13:48:05 -07:00
parent 2d8f5ec807
commit bbe157576c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/tweetstore/rhcloud-tweetstore/pom.xml
View File

@ -33,8 +33,8 @@
<properties> <properties>
<rhcloud.jboss.version>7.0.2.Final</rhcloud.jboss.version> <rhcloud.jboss.version>7.0.2.Final</rhcloud.jboss.version>
<rhcloud.jboss.address>localhost</rhcloud.jboss.address> <test.jboss.address>localhost</test.jboss.address>
<rhcloud.jboss.port>8088</rhcloud.jboss.port> <test.jboss.port>8088</test.jboss.port>
<jclouds.tweetstore.container>jclouds-rhcloud-tweetstore</jclouds.tweetstore.container> <jclouds.tweetstore.container>jclouds-rhcloud-tweetstore</jclouds.tweetstore.container>
</properties> </properties>
@ -98,9 +98,9 @@
<test.cloudonestorage.credential>${test.cloudonestorage.credential}</test.cloudonestorage.credential> <test.cloudonestorage.credential>${test.cloudonestorage.credential}</test.cloudonestorage.credential>
<test.ninefold-storage.identity>${test.ninefold-storage.identity}</test.ninefold-storage.identity> <test.ninefold-storage.identity>${test.ninefold-storage.identity}</test.ninefold-storage.identity>
<test.ninefold-storage.credential>${test.ninefold-storage.credential}</test.ninefold-storage.credential> <test.ninefold-storage.credential>${test.ninefold-storage.credential}</test.ninefold-storage.credential>
<rhcloud.jboss.home>${rhcloud.jboss.home}</rhcloud.jboss.home> <jboss.home>${rhcloud.jboss.home}</jboss.home>
<rhcloud.jboss.address>${rhcloud.jboss.address}</rhcloud.jboss.address> <jboss.address>${test.jboss.address}</jboss.address>
<rhcloud.jboss.port>${rhcloud.jboss.port}</rhcloud.jboss.port> <jboss.port>${test.jboss.port}</jboss.port>
<jclouds.tweetstore.blobstores>${jclouds.tweetstore.blobstores}</jclouds.tweetstore.blobstores> <jclouds.tweetstore.blobstores>${jclouds.tweetstore.blobstores}</jclouds.tweetstore.blobstores>
<jclouds.tweetstore.container>test.${jclouds.tweetstore.container}</jclouds.tweetstore.container> <jclouds.tweetstore.container>test.${jclouds.tweetstore.container}</jclouds.tweetstore.container>
<jboss.embedded.root>${project.build.directory}/rhcloud-jboss</jboss.embedded.root> <jboss.embedded.root>${project.build.directory}/rhcloud-jboss</jboss.embedded.root>
@ -108,8 +108,8 @@
<warfile>${project.build.directory}/${project.build.finalName}</warfile> <warfile>${project.build.directory}/${project.build.finalName}</warfile>
</systemPropertyVariables> </systemPropertyVariables>
<environmentVariables> <environmentVariables>
<OPENSHIFT_INTERNAL_IP>${rhcloud.jboss.address}</OPENSHIFT_INTERNAL_IP> <OPENSHIFT_INTERNAL_IP>${test.jboss.address}</OPENSHIFT_INTERNAL_IP>
<OPENSHIFT_INTERNAL_PORT>${rhcloud.jboss.port}</OPENSHIFT_INTERNAL_PORT> <OPENSHIFT_INTERNAL_PORT>${test.jboss.port}</OPENSHIFT_INTERNAL_PORT>
</environmentVariables> </environmentVariables>
</configuration> </configuration>
</execution> </execution>

2
demos/tweetstore/rhcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
View File

@ -172,7 +172,7 @@ public class TweetStoreLiveTest {
} }
@BeforeTest(dependsOnMethods = "clearAndCreateContainers") @BeforeTest(dependsOnMethods = "clearAndCreateContainers")
@Parameters({ "warfile", "rhcloud.jboss.address", "rhcloud.jboss.port", "rhcloud.jboss.home" }) @Parameters({ "warfile", "jboss.address", "jboss.port", "jboss.home" })
public void startDevAppServer(final String warfile, final String address, final String port, public void startDevAppServer(final String warfile, final String address, final String port,
String serverHome) throws Exception { String serverHome) throws Exception {
url = new URL(String.format("http://%s:%s", address, port)); url = new URL(String.format("http://%s:%s", address, port));

2
demos/tweetstore/rhcloud-tweetstore/src/test/resources/jbossas7/configuration/standalone.xml
View File

@ -194,7 +194,7 @@
</interfaces> </interfaces>
<socket-binding-group name="standard-sockets" default-interface="public"> <socket-binding-group name="standard-sockets" default-interface="public">
<socket-binding name="http" port="${rhcloud.jboss.port:8080}"/> <socket-binding name="http" port="${jboss.port:8080}"/>
<socket-binding name="https" port="8443"/> <socket-binding name="https" port="8443"/>
<socket-binding name="jmx-connector-registry" port="1090"/> <socket-binding name="jmx-connector-registry" port="1090"/>
<socket-binding name="jmx-connector-server" port="1091"/> <socket-binding name="jmx-connector-server" port="1091"/>