summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-22 08:01:42 (EDT)
committerManik Kishore2012-06-19 07:23:07 (EDT)
commit7c38947417ed22ca3404ea8dc7a243949427aaca (patch)
tree43783d8753d1177820f841178320854fa8dc1e47
parent92535893e267356577e84f9bb73d5664a7c4a018 (diff)
downloadorg.eclipse.stardust.ui.web-7c38947417ed22ca3404ea8dc7a243949427aaca.zip
org.eclipse.stardust.ui.web-7c38947417ed22ca3404ea8dc7a243949427aaca.tar.gz
org.eclipse.stardust.ui.web-7c38947417ed22ca3404ea8dc7a243949427aaca.tar.bz2
Jira-ID: CRNT-24188
updated xml schema and added spring-aop 3.0.5 RELESE in ivy git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54782 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--admin-portal/src/main/resources/META-INF/spring/admin-portal-context.xml4
-rw-r--r--business-control-center/src/main/resources/META-INF/spring/businessControlCenter-context.xml6
-rw-r--r--portal-common/ivy.xml1
-rw-r--r--portal-common/src/main/resources/META-INF/spring/ippPortalFramework-context.xml5
-rw-r--r--views-common/src/main/resources/META-INF/spring/ui-common-ipp-context.xml5
-rw-r--r--views-common/src/main/resources/META-INF/spring/views-common-context.xml10
-rw-r--r--views-common/src/main/resources/META-INF/spring/views-common-spi-context.xml6
7 files changed, 12 insertions, 25 deletions
diff --git a/admin-portal/src/main/resources/META-INF/spring/admin-portal-context.xml b/admin-portal/src/main/resources/META-INF/spring/admin-portal-context.xml
index 539824f..946e8e6 100644
--- a/admin-portal/src/main/resources/META-INF/spring/admin-portal-context.xml
+++ b/admin-portal/src/main/resources/META-INF/spring/admin-portal-context.xml
@@ -14,9 +14,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ippui="http://infinity.com/bpm/ui/common/uiDefinition"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
<!-- ********** APPLICATION BEANS ********** -->
diff --git a/business-control-center/src/main/resources/META-INF/spring/businessControlCenter-context.xml b/business-control-center/src/main/resources/META-INF/spring/businessControlCenter-context.xml
index 5458dd8..8cc5b9e 100644
--- a/business-control-center/src/main/resources/META-INF/spring/businessControlCenter-context.xml
+++ b/business-control-center/src/main/resources/META-INF/spring/businessControlCenter-context.xml
@@ -13,11 +13,7 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ippui="http://infinity.com/bpm/ui/common/uiDefinition"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
- <!-- **************************************************
+ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> <!-- **************************************************
********** BCC BEANS **********
************************************************** -->
diff --git a/portal-common/ivy.xml b/portal-common/ivy.xml
index cb5a30f..ad8a4b0 100644
--- a/portal-common/ivy.xml
+++ b/portal-common/ivy.xml
@@ -125,6 +125,7 @@
<dependency org="org.springframework" name="spring-context" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="org.springframework" name="spring-webmvc" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="org.springframework" name="spring-web" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
+ <dependency org="org.springframework" name="spring-aop" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="aopalliance" name="aopalliance" transitive="false" rev="1.0" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="org.apache.geronimo.specs" name="geronimo-ejb_2.1_spec" transitive="false" rev="1.1" conf="ipp-portal-base-lib-module-runtime->default"/>
<dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="ipp-portal-base-lib-module-runtime->default"/>
diff --git a/portal-common/src/main/resources/META-INF/spring/ippPortalFramework-context.xml b/portal-common/src/main/resources/META-INF/spring/ippPortalFramework-context.xml
index 0e0eb05..0ea98f4 100644
--- a/portal-common/src/main/resources/META-INF/spring/ippPortalFramework-context.xml
+++ b/portal-common/src/main/resources/META-INF/spring/ippPortalFramework-context.xml
@@ -13,10 +13,7 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ippui="http://infinity.com/bpm/ui/common/uiDefinition"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
+ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
<bean name="ippPortalApiPhaseListener" class="org.eclipse.stardust.ui.web.common.app.api.PortalApiPhaseListener" />
<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
diff --git a/views-common/src/main/resources/META-INF/spring/ui-common-ipp-context.xml b/views-common/src/main/resources/META-INF/spring/ui-common-ipp-context.xml
index 3066693..e404c36 100644
--- a/views-common/src/main/resources/META-INF/spring/ui-common-ipp-context.xml
+++ b/views-common/src/main/resources/META-INF/spring/ui-common-ipp-context.xml
@@ -12,10 +12,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ippui="http://infinity.com/bpm/ui/common/uiDefinition"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
+ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
<!-- ****************** LOGIN PANEL ****************** -->
<bean name="ippLoginDialog" class="org.eclipse.stardust.ui.web.viewscommon.login.dialogs.LoginDialogBean"
scope="session">
diff --git a/views-common/src/main/resources/META-INF/spring/views-common-context.xml b/views-common/src/main/resources/META-INF/spring/views-common-context.xml
index 5812569..5eef9dd 100644
--- a/views-common/src/main/resources/META-INF/spring/views-common-context.xml
+++ b/views-common/src/main/resources/META-INF/spring/views-common-context.xml
@@ -13,10 +13,12 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ippui="http://infinity.com/bpm/ui/common/uiDefinition"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+
<!-- From ProcessPortal -->
diff --git a/views-common/src/main/resources/META-INF/spring/views-common-spi-context.xml b/views-common/src/main/resources/META-INF/spring/views-common-spi-context.xml
index 5a4c5ef..623fbfd 100644
--- a/views-common/src/main/resources/META-INF/spring/views-common-spi-context.xml
+++ b/views-common/src/main/resources/META-INF/spring/views-common-spi-context.xml
@@ -13,11 +13,7 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ippui="http://infinity.com/bpm/ui/common/uiDefinition"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
- <bean name="userProvider"
+ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> <bean name="userProvider"
class="org.eclipse.stardust.ui.web.viewscommon.common.spi.user.impl.IppUserProvider"
scope="session">
<aop:scoped-proxy/>