LPS-55740 Update references

ipeychev · Jul 16, 2015 · 6214425 · 6214425
1 parent bd7ec36
commit 6214425
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/.classpath b/.classpath
@@ -284,8 +284,11 @@
 	<classpathentry kind="lib" path="lib/portal/stax-ex.jar"/>
 	<classpathentry kind="lib" path="lib/portal/streambuffer.jar"/>
 	<classpathentry kind="lib" path="lib/portal/stringtemplate.jar"/>
-	<classpathentry kind="lib" path="lib/portal/struts.jar"/>
+	<classpathentry kind="lib" path="lib/portal/struts-core.jar"/>
 	<classpathentry kind="lib" path="lib/portal/struts-el.jar"/>
+	<classpathentry kind="lib" path="lib/portal/struts-extras.jar"/>
+	<classpathentry kind="lib" path="lib/portal/struts-taglib.jar"/>
+	<classpathentry kind="lib" path="lib/portal/struts-tiles.jar"/>
 	<classpathentry kind="lib" path="lib/portal/tagsoup.jar"/>
 	<classpathentry kind="lib" path="lib/portal/tika-core.jar"/>
 	<classpathentry kind="lib" path="lib/portal/tika-parsers.jar"/>

diff --git a/modules/core/portal-bootstrap/system.packages.extra.bnd b/modules/core/portal-bootstrap/system.packages.extra.bnd
@@ -156,7 +156,7 @@ Export-Package:\
 	org.apache.log4j.varia;version='1.2.17',\
 	org.apache.log4j.xml;version='1.2.17',\
 	org.apache.regexp;version='2.7.1',\
-	org.apache.struts.*;version='1.2.9',\
+	org.apache.struts.*;version='1.3.10',\
 	org.apache.tools.ant.*;version='1.8.2',\
 	org.apache.xalan.*;version='2.7.1',\
 	org.apache.xpath.*;version='2.7.1',\
@@ -238,7 +238,10 @@ Include-Resource:\
 	@../../../lib/portal/spring-web.jar,\
 	@../../../lib/portal/spring-webmvc.jar,\
 	@../../../lib/portal/spring-webmvc-portlet.jar,\
-	@../../../lib/portal/struts.jar,\
+	@../../../lib/portal/struts-core.jar,\
+	@../../../lib/portal/struts-extras.jar,\
+	@../../../lib/portal/struts-taglib.jar,\
+	@../../../lib/portal/struts-tiles.jar,\
 	@../../../lib/portal/xalan.jar,\
 	@../../../lib/portal/xercesImpl.jar,\
 	@../../../lib/portal/xml-apis.jar,\

diff --git a/modules/sdk/gradle-plugins/src/com/liferay/gradle/plugins/tasks/InitGradleTask.java b/modules/sdk/gradle-plugins/src/com/liferay/gradle/plugins/tasks/InitGradleTask.java
@@ -145,8 +145,15 @@ public InitGradleTask() {
 		portalDependencyNotation(
 			"slf4j-api.jar", "org.slf4j", "slf4j-api", "1.7.2");
 		portalDependencyNotation(
-			"struts.jar", "com.liferay", "org.apache.struts",
-			"1.2.9.LIFERAY-PATCHED-1");
+			"struts-core.jar", "org.apache.struts", "struts-core", "1.3.10");
+		portalDependencyNotation(
+			"struts-extras.jar", "org.apache.struts", "struts-extras",
+			"1.3.10");
+		portalDependencyNotation(
+			"struts-taglib.jar", "org.apache.struts", "struts-taglib",
+			"1.3.10");
+		portalDependencyNotation(
+			"struts-tiles.jar", "org.apache.struts", "struts-tiles", "1.3.10");
 		portalDependencyNotation(
 			"util-slf4j.jar", "com.liferay.portal", "util-slf4j", "default");
 		portalDependencyNotation("wsdl4j.jar", "wsdl4j", "wsdl4j", "1.6.1");

diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -511,7 +511,10 @@
 				<classpath mode="compile">lib/portal/streambuffer.jar</classpath>
 				<classpath mode="compile">lib/portal/stringtemplate.jar</classpath>
 				<classpath mode="compile">lib/portal/struts-el.jar</classpath>
-				<classpath mode="compile">lib/portal/struts.jar</classpath>
+				<classpath mode="compile">lib/portal/struts-core.jar</classpath>
+				<classpath mode="compile">lib/portal/struts-extras.jar</classpath>
+				<classpath mode="compile">lib/portal/struts-taglib.jar</classpath>
+				<classpath mode="compile">lib/portal/struts-tiles.jar</classpath>
 				<classpath mode="compile">lib/portal/tagsoup.jar</classpath>
 				<classpath mode="compile">lib/portal/tika-core.jar</classpath>
 				<classpath mode="compile">lib/portal/tika-parsers.jar</classpath>

diff --git a/portal-web/build.xml b/portal-web/build.xml
@@ -44,7 +44,10 @@
 		<pathelement location="${project.dir}/lib/portal/log4j.jar" />
 		<pathelement location="${project.dir}/lib/portal/openid4java.jar" />
 		<pathelement location="${project.dir}/lib/portal/rome.jar" />
-		<pathelement location="${project.dir}/lib/portal/struts.jar" />
+		<pathelement location="${project.dir}/lib/portal/struts-core.jar" />
+		<pathelement location="${project.dir}/lib/portal/struts-extras.jar" />
+		<pathelement location="${project.dir}/lib/portal/struts-taglib.jar" />
+		<pathelement location="${project.dir}/lib/portal/struts-tiles.jar" />
 	</path>
 
 	<extension-point name="build-portal-web-dependencies" depends="build-css,build-dtd,build-vaadin" />

diff --git a/util-bridges/build.xml b/util-bridges/build.xml
@@ -12,7 +12,7 @@
 		<pathelement path="${project.dir}/portal-service/classes" />
 		<pathelement path="${project.dir}/util-java/classes" />
 		<fileset dir="${project.dir}/lib/development" includes="groovy.jar,jruby.jar,resin.jar" />
-		<fileset dir="${project.dir}/lib/portal" includes="bsf.jar,commons-logging.jar,liferay-rhino.jar,portals-bridges.jar,struts.jar" />
+		<fileset dir="${project.dir}/lib/portal" includes="bsf.jar,commons-logging.jar,liferay-rhino.jar,portals-bridges.jar,struts-core.jar,struts-extras.jar,struts-taglib.jar,struts-tiles.jar" />
 	</path>
 
 	<macrodef name="compile-java">