Merge branch 'issue103' into development

rundeck · Dec 1, 2010 · a68e1ad · a68e1ad
2 parents db34f36 + e0d0c73
commit a68e1ad
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/core/src/java/com/dtolabs/launcher/Check.java b/core/src/java/com/dtolabs/launcher/Check.java
@@ -267,7 +267,7 @@ void testEtcLog4jProperties(final File baseDir, final Properties inputProps) thr
         expectedProps.setProperty("log4j.logger.com.dtolabs.rundeck.log.common", "INFO,CommonLog");
         expectedProps.setProperty("log4j.appender.CommonLog", "org.apache.log4j.net.SocketAppender");
         expectedProps.setProperty("log4j.appender.CommonLog.remoteHost", requiredParams.getServerHostname());
-        expectedProps.setProperty("log4j.appender.CommonLog.port", "1055");
+        expectedProps.setProperty("log4j.appender.CommonLog.port", "4435");
         expectedProps.setProperty("log4j.appender.CommonLog.locationInfo", "true");
 
 

diff --git a/core/src/templates/etc/console-log4j.properties.template b/core/src/templates/etc/console-log4j.properties.template
@@ -26,5 +26,5 @@ log4j.appender.file.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
 #
 #log4j.appender.CommonLog=org.apache.log4j.net.SocketAppender
 #log4j.appender.CommonLog.remoteHost=@framework.server.hostname@
-#log4j.appender.CommonLog.port=1055
+#log4j.appender.CommonLog.port=4435
 #log4j.appender.CommonLog.locationInfo=true
diff --git a/core/src/templates/etc/run-defaults.properties b/core/src/templates/etc/run-defaults.properties
@@ -3,9 +3,9 @@ framework.server.username = admin
 framework.server.password = admin
 framework.server.hostname = localhost
 framework.server.name = localhost
-framework.server.port = 8080
+framework.server.port = 4440
 framework.rundeck.url = http://${framework.server.hostname}:${framework.server.port}/rundeck
-reportcenter.log4j.port = 1055
+reportcenter.log4j.port = 4435
 #
 #######indirectly set (from required opts) cannot be overridden########
 framework.projects.dir = ${rdeck.base}${file.separator}projects
@@ -70,7 +70,7 @@ jndi.userNameRDN=cn
 
 #
 # log4j port for reportcenter
-reportservice.log4j.port=1055
+reportservice.log4j.port=4435
 
 # Username for remote ssh connections from the node
 framework.ssh.user = ${user.name}

diff --git a/packaging/root/etc/rundeck/client/log4j.properties b/packaging/root/etc/rundeck/client/log4j.properties
@@ -50,6 +50,6 @@ log4j.appender.Chainsaw.locationInfo=true
 #
 log4j.appender.CommonLog=org.apache.log4j.net.SocketAppender
 log4j.appender.CommonLog.remoteHost=localhost
-log4j.appender.CommonLog.port=1055
+log4j.appender.CommonLog.port=4435
 log4j.appender.CommonLog.locationInfo=true
 
diff --git a/packaging/root/etc/rundeck/server/rundeck-config.properties b/packaging/root/etc/rundeck/server/rundeck-config.properties
@@ -5,7 +5,7 @@ loglevel.default=INFO
 rss.enabled=true
 # 
 #grails.serverURL=http://hostname:PORT
-reportservice.log4j.port=1055
+reportservice.log4j.port=4435
 dataSource.dbCreate = update
 dataSource.url = jdbc:hsqldb:file:/var/lib/rundeck/data/grailsdb;shutdown=true
 

diff --git a/rundeckapp/etc/config-defaults.properties b/rundeckapp/etc/config-defaults.properties
@@ -21,8 +21,8 @@ loginmodule.name=RDpropertyfilelogin
 loginmodule.conf.name=jaas-loginmodule.conf
 rundeck.config.name=rundeck-config.properties
 server.hostname=localhost
-server.http.port=8080
-server.reportservice.port=1055
+server.http.port=4440
+server.reportservice.port=4435
 server.datastore.path=rundeck/data/grailsdb
 default.user.name=admin
 default.user.password=admin
diff --git a/rundeckapp/grails-app/conf/BootStrap.groovy b/rundeckapp/grails-app/conf/BootStrap.groovy
@@ -70,7 +70,7 @@ class BootStrap {
                      if(hostname=~/^[\d\.]+$/){
                          hostname="localhost"
                      }
-                     port="8080"
+                     port="4440"
                  }
                  setup.getParameters().setNodeArg(hostname)
                  setup.getParameters().properties["framework.server.port"]=port
@@ -303,8 +303,8 @@ class BootStrap {
          if ("true" != grailsApplication.config.reportservice.log4j.disabled.toString()) {
              int port = -1
              if (!grailsApplication.config.reportservice.log4j.port) {
-                 port = 1055
-                 log.warn("'reportservice.log4j.port' configuration property not set: using default listen port (1055)")
+                 port = 4435
+                 log.warn("'reportservice.log4j.port' configuration property not set: using default listen port (4435)")
              } else {
                  def t = grailsApplication.config.reportservice.log4j.port
                  port = Integer.parseInt(t.toString())

diff --git a/rundeckapp/src/java/com/dtolabs/rundeck/RunServer.java b/rundeckapp/src/java/com/dtolabs/rundeck/RunServer.java
@@ -29,7 +29,7 @@
  */
 public class RunServer {
 
-    int port = Integer.getInteger("server.http.port", 8080);
+    int port = Integer.getInteger("server.http.port", 4440);
     File basedir;
     File serverdir;
     private static final String REALM_NAME = "rundeckrealm";

diff --git a/test/README.md b/test/README.md
@@ -1,4 +1,4 @@
-To luanch the following integration test, make sure to have rundeck launched and listening on port 8080 (default).
+To launch the following integration test, make sure to have rundeck launched and listening on port 4440 (default).
 
 Set RDECK_BASE=<launcher directory>
 

diff --git a/test/testweb.sh b/test/testweb.sh
@@ -15,7 +15,7 @@ fi
 
 # test log in 
 
-url='http://localhost:8080'
+url='http://localhost:4440'
 loginurl="${url}/j_security_check"
 
 # get main page for login