[jbpm-commits] JBoss JBPM SVN: r5540 - in jbpm4/trunk/modules: distro/src/main/files/install/src/hsqldb-server and 1 other directories.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-08-26 08:57:25 -0400 (Wed, 26 Aug 2009)
New Revision: 5540

Added:
   jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.bat
   jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.sh
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/DefaultServerConfig.java
Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfigFactory.java
Log:
Added fixes for Tomcat console support

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-26 09:11:53 UTC (rev 5539)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-26 12:57:25 UTC (rev 5540)
@@ -348,6 +348,7 @@
         <include name="hibernate-core.jar" />
         <include name="hibernate-cglib-repack.jar" />
         <include name="javassist.jar" />
+      	<include name="jbpm-spi.jar" />
         <include name="jta.jar" />
         <include name="juel*.jar" />
         <include name="livetribe-jsr223.jar" />

Added: jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.bat
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.bat	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.bat	2009-08-26 12:57:25 UTC (rev 5540)
@@ -0,0 +1 @@
+java -cp hsqldb.jar org.hsqldb.util.DatabaseManager
\ No newline at end of file

Added: jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.sh
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.sh	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/hsqldb-server/start-hsqldb-manager.sh	2009-08-26 12:57:25 UTC (rev 5540)
@@ -0,0 +1 @@
+java -cp hsqldb.jar org.hsqldb.util.DatabaseManager
\ No newline at end of file

Added: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/DefaultServerConfig.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/DefaultServerConfig.java	                        (rev 0)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/DefaultServerConfig.java	2009-08-26 12:57:25 UTC (rev 5540)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+/**
+ * 
+ */
+package org.jbpm.integration.spi.mgmt;
+
+import java.io.File;
+
+/**
+ * Serverconfig to fall back on when no 'real' serverconfig can be found.
+ * 
+ * @author Joram Barrez
+ */
+public class DefaultServerConfig implements ServerConfig {
+
+  private static final String DEFAULT_HOST = "localhost";
+  
+  private static final int DEFAULT_PORT = 8080;
+  
+  public String getWebServiceHost() {
+    return DEFAULT_HOST;
+  }
+  
+  public int getWebServicePort() {
+    return DEFAULT_PORT;
+  }
+
+  public String getImplementationTitle() {
+    return "DefaultImplementation";
+  }
+
+  public String getImplementationVersion() {
+    return "DefaultImplementation";
+  }
+
+  public File getHomeDir() {
+    return null;
+  }
+
+  public File getServerDataDir() {
+    return null;
+  }
+
+  public File getServerTempDir() {
+    return null;
+  }
+
+  public int getWebServiceSecurePort() {
+    return 0;
+  }
+
+}

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfigFactory.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfigFactory.java	2009-08-26 09:11:53 UTC (rev 5539)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfigFactory.java	2009-08-26 12:57:25 UTC (rev 5540)
@@ -25,18 +25,21 @@
 
 /**
  * Factory to container independent config
- *
+ * 
  * @author Thomas.Diesler at jboss.org
  * @author Heiko.Braun at jboss.com
  * 
  * @since 08-May-2006
  */
-public class ServerConfigFactory
-{
-   public static ServerConfig getServerConfig()
-   {
-     return new KernelAwareSPIFactory().getKernelProvidedSPI(
-       ServerConfig.BEAN_NAME, ServerConfig.class  
-     );
-   }
+public class ServerConfigFactory {
+
+  public static ServerConfig getServerConfig() {
+    try {
+      return new KernelAwareSPIFactory()
+        .getKernelProvidedSPI(ServerConfig.BEAN_NAME, ServerConfig.class);
+    } catch (NoClassDefFoundError e) { // FIXME: workaround for Tomcat: if no JBoss classes were found, fall back to defaults
+      // Fall back to defaults
+      return new DefaultServerConfig();
+    } 
+  }
 }
\ No newline at end of file