summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-19 02:34:46 (EDT)
committerManik Kishore2012-06-19 07:21:59 (EDT)
commit57565d736ed8d6abaa7955a02e4b0644f6788be9 (patch)
treebe492aa1c4e95705323037551f4c37f9d19cdfb9
parent31ff5da6d5caaff88d171e5888898fd2db217ad5 (diff)
downloadorg.eclipse.stardust.ui.web-57565d736ed8d6abaa7955a02e4b0644f6788be9.zip
org.eclipse.stardust.ui.web-57565d736ed8d6abaa7955a02e4b0644f6788be9.tar.gz
org.eclipse.stardust.ui.web-57565d736ed8d6abaa7955a02e4b0644f6788be9.tar.bz2
Jira-ID: CRNT-24188
Upgrade Spring to version 3 - Portal git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54627 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--admin-portal/.classpath2
-rw-r--r--admin-portal/ivy.xml1
-rw-r--r--business-control-center/.classpath2
-rw-r--r--business-control-center/ivy.xml1
-rw-r--r--graphics-common/.classpath7
-rw-r--r--graphics-common/ivy.xml4
-rw-r--r--portal-common/.classpath7
-rw-r--r--portal-common/ivy.xml4
-rw-r--r--process-portal/.classpath3
-rw-r--r--process-portal/ivy.xml2
-rw-r--r--views-common/.classpath6
-rw-r--r--views-common/ivy.xml2
12 files changed, 31 insertions, 10 deletions
diff --git a/admin-portal/.classpath b/admin-portal/.classpath
index 63b8562..7942975 100644
--- a/admin-portal/.classpath
+++ b/admin-portal/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="var" path="CARNOT_HOME/lib/carnot-engine.jar"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-comps-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/servlet/2.4/servlet-2.4.jar"/>
diff --git a/admin-portal/ivy.xml b/admin-portal/ivy.xml
index d658ab8..2585f76 100644
--- a/admin-portal/ivy.xml
+++ b/admin-portal/ivy.xml
@@ -51,6 +51,7 @@
<dependency org="com.infinity.bpm" name="ipp-views-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-views-common-runtime" />
<dependency org="com.infinity.bpm" name="ipp-portal-api" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-portal-api-runtime" />
<dependency org="com.infinity.bpm" name="ipp-graphics-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-graphics-common-runtime" />
+ <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-administration-perspective-runtime->default"/>
<!-- ipp-administration-perspective-provided -->
<dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-provided->jsf-api-module-compile" />
diff --git a/business-control-center/.classpath b/business-control-center/.classpath
index 23234f8..8caf4d8 100644
--- a/business-control-center/.classpath
+++ b/business-control-center/.classpath
@@ -5,7 +5,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/Portal-Common"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-comps-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/servlet/2.4/servlet-2.4.jar"/>
diff --git a/business-control-center/ivy.xml b/business-control-center/ivy.xml
index 899c33d..19c6289 100644
--- a/business-control-center/ivy.xml
+++ b/business-control-center/ivy.xml
@@ -54,6 +54,7 @@
<dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.10" conf="ipp-business-control-center-runtime->default">
<exclude org="log4j" module="log4j"/>
</dependency>
+ <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-business-control-center-runtime->default"/>
<!-- ipp-business-control-center-provided -->
<dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-business-control-center-provided->jsf-api-module-compile" />
diff --git a/graphics-common/.classpath b/graphics-common/.classpath
index 7fe37ce..2fc37be 100644
--- a/graphics-common/.classpath
+++ b/graphics-common/.classpath
@@ -8,9 +8,12 @@
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="var" path="CARNOT_HOME/lib/carnot-engine.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/sun/jersey/1.1.5.1/jsr311-api-1.1.jar"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar" />
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-web-3.0.5.RELEASE-sources.jar" />
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/javax/servlet/2.4/servlet-2.4.jar"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/google.com/gson/1.6/gson-1.6.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/google.com/gson/1.6/gson-1.6.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/views-common"/>
<classpathentry kind="output" path=".eclipse/bin"/>
</classpath>
diff --git a/graphics-common/ivy.xml b/graphics-common/ivy.xml
index ad19437..c9c2738 100644
--- a/graphics-common/ivy.xml
+++ b/graphics-common/ivy.xml
@@ -48,6 +48,10 @@
<dependency org="com.infinity.bpm" name="ipp-views-common" rev="${ipp.version.full}" conf="ipp-graphics-common-runtime->ipp-views-common-runtime" />
<dependency org="com.sun.jersey" name="jersey-core" rev="1.1.5.1" conf="ipp-graphics-common-runtime->default" />
<dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" conf="ipp-graphics-common-runtime->default" />
+ <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>
+ <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>
+ <dependency org="org.springframework" name="spring-context" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>
+ <dependency org="org.springframework" name="spring-web" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>
<!-- ipp-graphics-common-provided -->
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="ipp-graphics-common-provided->default" />
diff --git a/portal-common/.classpath b/portal-common/.classpath
index 5fd9754..09474ec 100644
--- a/portal-common/.classpath
+++ b/portal-common/.classpath
@@ -5,11 +5,10 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-sources.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/javax/servlet/2.4/servlet-2.4.jar" sourcepath="/Q-ARCHIVE/thirdparty/javax/servlet/2.4/servlet-2.4-sources.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-comps-ee-infinity04-EE-1.8.2.GA_P03.jar" sourcepath="/Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-comps-src.zip"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-facelets-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-ee-infinity04-EE-1.8.2.GA_P03.jar" sourcepath="/Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/just-ice-src.zip"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-ee-infinity04-EE-1.8.2.GA_P03.jar" sourcepath="/Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/just-ice-src.zip"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-test.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/junit/4.4/junit-4.4.jar"/>
@@ -19,5 +18,9 @@
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/javax/el/facelets-1.1.14/el-api.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/org.apache/slf4j/1.5.3/slf4j-api-1.5.3.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/org.apache/slf4j/1.5.3/slf4j-log4j12-1.5.3.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar" />
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-test-3.0.5.RELEASE.jar" />
<classpathentry kind="output" path=".eclipse/classes"/>
</classpath>
diff --git a/portal-common/ivy.xml b/portal-common/ivy.xml
index 797ceb7..8d74f8d 100644
--- a/portal-common/ivy.xml
+++ b/portal-common/ivy.xml
@@ -75,6 +75,10 @@
<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="ipp-portal-common-runtime->default" />
<dependency org="commons-digester" name="commons-digester" rev="1.8" conf="ipp-portal-common-runtime->default" />
<dependency org="commons-lang" name="commons-lang" rev="2.4" conf="ipp-portal-common-runtime->default" />
+ <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-common-runtime->default"/>
+ <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-common-runtime->default"/>
+ <dependency org="org.springframework" name="spring-context" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-common-runtime->default"/>
+
<!-- ipp-portal-common-provided -->
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="ipp-portal-common-provided, compile->default" />
diff --git a/process-portal/.classpath b/process-portal/.classpath
index 36e6069..c6efd61 100644
--- a/process-portal/.classpath
+++ b/process-portal/.classpath
@@ -6,7 +6,8 @@
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry combineaccessrules="false" kind="src" path="/portal-api"/>
<classpathentry combineaccessrules="false" kind="src" path="/Portal-Common"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/javax/servlet/2.4/servlet-2.4.jar" sourcepath="/Q-ARCHIVE/thirdparty/javax/servlet/2.4/servlet-2.4-sources.jar">
<attributes>
<attribute name="javadoc_location" value="http://java.sun.com/j2ee/1.4/docs/api/"/>
diff --git a/process-portal/ivy.xml b/process-portal/ivy.xml
index 0500b41..1da0f70 100644
--- a/process-portal/ivy.xml
+++ b/process-portal/ivy.xml
@@ -57,6 +57,8 @@
<dependency org="com.infinity.bpm" name="ipp-views-common" rev="${ipp.version.full}" conf="ipp-workflow-perspective-runtime->ipp-views-common-runtime" />
<dependency org="com.infinity.bpm" name="ipp-portal-api" rev="${ipp.version.full}" conf="ipp-workflow-perspective-runtime->ipp-portal-api-runtime" />
<dependency org="com.infinity.bpm" name="ipp-graphics-common" rev="${ipp.version.full}" conf="ipp-workflow-perspective-runtime->ipp-graphics-common-runtime" />
+ <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-workflow-perspective-runtime->default"/>
+ <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-workflow-perspective-runtime->default"/>
<!-- ipp-workflow-perspective-provided -->
<dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-workflow-perspective-provided->jsf-api-module-compile" />
diff --git a/views-common/.classpath b/views-common/.classpath
index feb4b5b..efc1296 100644
--- a/views-common/.classpath
+++ b/views-common/.classpath
@@ -3,12 +3,12 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
<classpathentry kind="var" path="CARNOT_HOME/lib/carnot-engine.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-comps-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-facelets-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
- <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-test.jar"/>
+ <classpathentry kind="var" path="Q-ARCHIVE/thirdparty/icefaces.org/1.8.2/icefaces-ee-infinity04-EE-1.8.2.GA_P03.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/junit/4.4/junit-4.4.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/javax/jsf/1.1_02/jsf-api.jar"/>
diff --git a/views-common/ivy.xml b/views-common/ivy.xml
index 0c2a4e4..ad47b1a 100644
--- a/views-common/ivy.xml
+++ b/views-common/ivy.xml
@@ -64,6 +64,8 @@
<dependency org="com.sun.jersey" name="jersey-core" rev="1.1.5.1" conf="ipp-views-common-runtime->default" />
<dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" conf="ipp-views-common-runtime->default" />
<dependency org="com.infinity.bpm" name="carnot-spring-module" rev="${ipp.version.full}" conf="ipp-views-common-runtime->spring-module-runtime" />
+ <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-views-common-runtime->default"/>
+ <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-views-common-runtime->default"/>
<!-- ipp-views-common-provided -->
<dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-views-common-provided->jsf-api-module-compile" />