JBoss Portal SVN: r5964 - in trunk: cms core workflow
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-01-08 10:29:00 -0500 (Mon, 08 Jan 2007)
New Revision: 5964
Added:
trunk/workflow/.classpath
trunk/workflow/.project
Modified:
trunk/cms/.classpath
trunk/core/.classpath
Log:
Updated Eclipse files
Modified: trunk/cms/.classpath
===================================================================
--- trunk/cms/.classpath 2007-01-08 13:07:21 UTC (rev 5963)
+++ trunk/cms/.classpath 2007-01-08 15:29:00 UTC (rev 5964)
@@ -39,5 +39,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/search"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/workflow"/>
+ <classpathentry kind="lib" path="/thirdparty/jbpm/lib/jbpm-3.1.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/core/.classpath
===================================================================
--- trunk/core/.classpath 2007-01-08 13:07:21 UTC (rev 5963)
+++ trunk/core/.classpath 2007-01-08 15:29:00 UTC (rev 5964)
@@ -46,5 +46,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/format"/>
<classpathentry combineaccessrules="false" kind="src" path="/federation"/>
<classpathentry combineaccessrules="false" kind="src" path="/registration"/>
+ <classpathentry kind="lib" path="/thirdparty/jbpm/lib/jbpm-3.1.2.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/workflow"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: trunk/workflow/.classpath
===================================================================
--- trunk/workflow/.classpath 2007-01-08 13:07:21 UTC (rev 5963)
+++ trunk/workflow/.classpath 2007-01-08 15:29:00 UTC (rev 5964)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jems"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbpm/lib/jbpm-3.1.2.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/workflow/.project
===================================================================
--- trunk/workflow/.project 2007-01-08 13:07:21 UTC (rev 5963)
+++ trunk/workflow/.project 2007-01-08 15:29:00 UTC (rev 5964)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>workflow</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
17 years, 5 months
JBoss Portal SVN: r5963 - trunk/server/src/main/org/jboss/portal/server/deployment
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-01-08 08:07:21 -0500 (Mon, 08 Jan 2007)
New Revision: 5963
Modified:
trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
more JBPORTAL-1178 : Make JBoss Web 1.0.x deployment accepted by the portal deployer
Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 13:07:09 UTC (rev 5962)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 13:07:21 UTC (rev 5963)
@@ -104,10 +104,14 @@
{
return TOMCAT4;
}
- else if (result.startsWith("JBoss Web Server/1.0"))
+ else if (result.startsWith("JBoss Web Server/1"))
{
return TOMCAT5;
}
+ else if (result.startsWith("JBoss Web Server/2"))
+ {
+ return TOMCAT6;
+ }
}
}
catch (ClassNotFoundException e)
17 years, 5 months
JBoss Portal SVN: r5962 - branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-01-08 08:07:09 -0500 (Mon, 08 Jan 2007)
New Revision: 5962
Modified:
branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
more JBPORTAL-1178 : Make JBoss Web 1.0.x deployment accepted by the portal deployer
Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 11:02:18 UTC (rev 5961)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 13:07:09 UTC (rev 5962)
@@ -103,10 +103,14 @@
{
return TOMCAT4;
}
- else if (result.startsWith("JBoss Web Server/1.0"))
+ else if (result.startsWith("JBoss Web Server/1"))
{
return TOMCAT5;
}
+ else if (result.startsWith("JBoss Web Server/2"))
+ {
+ return TOMCAT6;
+ }
}
}
catch (ClassNotFoundException e)
17 years, 5 months
JBoss Portal SVN: r5961 - in branches: JBoss_Portal_Branch_2_2/core/src/main/org/jboss/portal/core/portlet/management JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-01-08 06:02:18 -0500 (Mon, 08 Jan 2007)
New Revision: 5961
Modified:
branches/JBoss_Portal_Branch_2_2/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
Log:
Fixed JBPORTAL-1177 in JBoss_Portal_2_2 and JBoss_Portal_2_4 branches
"impossible to move the windows on the right with the management portlet"
Modified: branches/JBoss_Portal_Branch_2_2/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_2/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-01-08 10:34:19 UTC (rev 5960)
+++ branches/JBoss_Portal_Branch_2_2/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-01-08 11:02:18 UTC (rev 5961)
@@ -582,6 +582,7 @@
window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
}
+ break;
}
case MOVE_LEFT:
{
@@ -600,6 +601,7 @@
window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
}
+ break;
}
}
}
Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-01-08 10:34:19 UTC (rev 5960)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-01-08 11:02:18 UTC (rev 5961)
@@ -640,6 +640,7 @@
window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
}
+ break;
}
case MOVE_LEFT:
{
@@ -658,6 +659,7 @@
window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
}
+ break;
}
}
}
17 years, 5 months
JBoss Portal SVN: r5960 - trunk/core/src/main/org/jboss/portal/core/portlet/management
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-01-08 05:34:19 -0500 (Mon, 08 Jan 2007)
New Revision: 5960
Modified:
trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
Log:
Fixed JBPORTAL-1177 in Portal_2.6 branch
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-01-08 09:05:00 UTC (rev 5959)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-01-08 10:34:19 UTC (rev 5960)
@@ -647,6 +647,7 @@
window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
}
+ break;
}
case MOVE_LEFT:
{
@@ -665,6 +666,7 @@
window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
}
+ break;
}
}
}
17 years, 5 months
JBoss Portal SVN: r5959 - trunk/server/src/main/org/jboss/portal/server/deployment
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-01-08 04:05:00 -0500 (Mon, 08 Jan 2007)
New Revision: 5959
Modified:
trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
minor javadoc
Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 09:04:46 UTC (rev 5958)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 09:05:00 UTC (rev 5959)
@@ -76,7 +76,11 @@
}
}
- /** Recognize the jbossweb container and returns its version. */
+ /**
+ * Recognize the jbossweb container and returns its version.
+ *
+ * @return the jbossweb detected version or <code>UNKNOWN</code>
+ */
private static int getVersion()
{
try
17 years, 5 months
JBoss Portal SVN: r5958 - branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-01-08 04:04:46 -0500 (Mon, 08 Jan 2007)
New Revision: 5958
Modified:
branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
minor javadoc
Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 09:03:15 UTC (rev 5957)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 09:04:46 UTC (rev 5958)
@@ -75,7 +75,11 @@
}
}
- /** Recognize the jbossweb container and returns its version. */
+ /**
+ * Recognize the jbossweb container and returns its version.
+ *
+ * @return the jbossweb detected version or <code>UNKNOWN</code>
+ */
private static int getVersion()
{
try
17 years, 5 months
JBoss Portal SVN: r5957 - trunk/server/src/main/org/jboss/portal/server/deployment
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-01-08 04:03:15 -0500 (Mon, 08 Jan 2007)
New Revision: 5957
Modified:
trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
expant JBoss Web recognition to 1.0.x
Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 09:02:18 UTC (rev 5956)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 09:03:15 UTC (rev 5957)
@@ -100,7 +100,7 @@
{
return TOMCAT4;
}
- else if (result.startsWith("JBoss Web Server/1.0.1.GA"))
+ else if (result.startsWith("JBoss Web Server/1.0"))
{
return TOMCAT5;
}
17 years, 5 months
JBoss Portal SVN: r5956 - branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-01-08 04:02:18 -0500 (Mon, 08 Jan 2007)
New Revision: 5956
Modified:
branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
make portlet deployment work with tomcat 6 and JBoss Web Server 1.0.x
Modified: branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 08:56:03 UTC (rev 5955)
+++ branches/JBoss_Portal_Branch_2_4/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 09:02:18 UTC (rev 5956)
@@ -45,6 +45,7 @@
private static final int UNKNOWN = 0;
private static final int TOMCAT4 = 1;
private static final int TOMCAT5 = 2;
+ private static final int TOMCAT6 = 3;
private final MBeanServer server;
@@ -66,6 +67,9 @@
return new PortalWebTomcat4App(webApp);
case TOMCAT5:
return new PortalWebTomcat5App(webApp, server);
+ case TOMCAT6:
+ // For now trying to build TC6 with TC5 web app
+ return new PortalWebTomcat5App(webApp, server);
default:
throw new CannotCreatePortletWebAppException("JBossWeb cannot handle it");
}
@@ -83,14 +87,22 @@
String result = (String)getServerInfoMethod.invoke(null, EMPTY_OBJECT_ARRAY);
if (result != null)
{
- if (result.startsWith("Apache Tomcat/5"))
+ if (result.startsWith("Apache Tomcat/6"))
{
+ return TOMCAT6;
+ }
+ else if (result.startsWith("Apache Tomcat/5"))
+ {
return TOMCAT5;
}
else if (result.startsWith("Apache Tomcat/4"))
{
return TOMCAT4;
}
+ else if (result.startsWith("JBoss Web Server/1.0"))
+ {
+ return TOMCAT5;
+ }
}
}
catch (ClassNotFoundException e)
17 years, 5 months
JBoss Portal SVN: r5955 - trunk/server/src/main/org/jboss/portal/server/deployment
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-01-08 03:56:03 -0500 (Mon, 08 Jan 2007)
New Revision: 5955
Modified:
trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
Log:
added JBoss Web in the detected configurations of deployment
Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 04:43:22 UTC (rev 5954)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2007-01-08 08:56:03 UTC (rev 5955)
@@ -100,6 +100,10 @@
{
return TOMCAT4;
}
+ else if (result.startsWith("JBoss Web Server/1.0.1.GA"))
+ {
+ return TOMCAT5;
+ }
}
}
catch (ClassNotFoundException e)
17 years, 5 months