LPS-23557

build-dist.xml

@@ -265,8 +265,6 @@
 			<fileset dir="${lp.plugins.dir}/dist" includes="*.war" />
 		</copy>
 
-		<copy file="tunnel-web/tunnel-web.war" tofile="${tcat.dir}/admin/tcat_init/webapps/${lp.version.tcat}/tunnel-web.war" />
-
 		<ant dir="${lp.plugins.dir}" target="clean" inheritAll="false" />
 
 		<echo file="${lp.plugins.dir}/build.${user.name}.properties">plugins.includes=${lp.plugins.includes.required}</echo>
@@ -691,8 +689,6 @@ know what you are doing as it can cause loss of data.
 		<antcall target="zip-tcat" />
 		<antcall target="zip-tomcat" />
 
-		<copy file="tunnel-web/tunnel-web.war" tofile="dist/liferay-portal-tunnel-web-${lp.version}.war" />
-
 		<!--<antcall target="build-dist-sql-oracle" />-->
 
 		<ant dir="${lp.plugins.dir}" target="extract-plugins-sdk" inheritAll="false" />

build-maven.xml

@@ -167,10 +167,6 @@ Run "ant -f build-dist.xml all zip-portal-war" to generate that file.
 				dir="portal-service"
 				includes="portal-service.jar,portal-service-javadoc.jar,portal-service-sources.jar"
 			/>
-			<fileset
-				dir="tunnel-web"
-				includes="tunnel-web.war"
-			/>
 			<fileset
 				dir="support-tomcat"
 				includes="support-tomcat.jar,support-tomcat-javadoc.jar,support-tomcat-sources.jar"

build-test-weblogic-10.3.xml

@@ -91,10 +91,6 @@
 					<arg line="-pw ${vm.password} ${vm.username}@${vm.host} C:\Java\jdk-1.6.0_23\bin\java.exe -cp C:\Oracle\Middleware\wlserver_10.3\server\lib\weblogic.jar -Xmx1024m weblogic.Deployer -adminurl t3://localhost:7001 -user system -password password1 -deploy -upload C:\liferay-portal-${lp.version}.war" />
 				</exec>
 
-				<exec executable="${plink.executable}">
-					<arg line="-pw ${vm.password} ${vm.username}@${vm.host} C:\Java\jdk-1.6.0_23\bin\java.exe -cp C:\Oracle\Middleware\wlserver_10.3\server\lib\weblogic.jar -Xmx256m weblogic.Deployer -adminurl t3://localhost:7001 -user system -password password1 -deploy -upload C:\tunnel-web.war" />
-				</exec>
-
 				<exec executable="${plink.executable}">
 					<arg line="-pw ${vm.password} ${vm.username}@${vm.host} cmd.exe /c C:\oracle\middleware\user_projects\domains\base_domain\bin\stopWebLogic.cmd" />
 				</exec>

build-test-websphere-6.1.xml

@@ -72,10 +72,6 @@ $AdminConfig save
 
 $AdminApp install "C:/liferay-portal-${lp.version}.war" {-appname liferay-portal -contextroot /}
 
-$AdminConfig save
-
-$AdminApp install "C:/tunnel-web.war" {-appname liferay-tunnel-web -contextroot /tunnel-web}
-
 $AdminConfig save</echo>
 
 		<exec executable="${pscp.executable}">

build-test-websphere-7.0.xml

@@ -78,18 +78,11 @@ print AdminConfig.save()
 
 print AdminApp.list()
 
-print AdminApp.install('C:/tunnel-web.war', '[-appname liferay-tunnel-web -contextroot /tunnel-web]')
-
-print AdminConfig.save()
-
-print AdminApp.list()
-
 appManager = AdminControl.queryNames('type=ApplicationManager,process=server1,*')
 
 print appManager
 
-print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
-print AdminControl.invoke(appManager, 'startApplication', 'liferay-tunnel-web')</echo>
+print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')</echo>
 
 		<exec executable="${pscp.executable}">
 			<arg line="-pw ${vm.password} wsadmin.py ${vm.username}@${vm.host}:/" />

build-test-websphere-8.0.xml

@@ -74,18 +74,11 @@ print AdminConfig.save()
 
 print AdminApp.list()
 
-print AdminApp.install('C:/tunnel-web.war', '[-appname liferay-tunnel-web -contextroot /tunnel-web]')
-
-print AdminConfig.save()
-
-print AdminApp.list()
-
 appManager = AdminControl.queryNames('type=ApplicationManager,process=server1,*')
 
 print appManager
 
-print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
-print AdminControl.invoke(appManager, 'startApplication', 'liferay-tunnel-web')</echo>
+print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')</echo>
 
 		<exec executable="${pscp.executable}">
 			<arg line="-pw ${vm.password} wsadmin.py ${vm.username}@${vm.host}:/" />

build-test.xml

@@ -2646,7 +2646,7 @@ executable ZIP file.
 			</not>
 			<then>
 				<exec executable="${pscp.executable}">
-					<arg line="-pw ${vm.password} hosts dist\liferay-portal-${lp.version}.war tunnel-web\tunnel-web.war ${vm.username}@${vm.host}:/" />
+					<arg line="-pw ${vm.password} hosts dist\liferay-portal-${lp.version}.war ${vm.username}@${vm.host}:/" />
 				</exec>
 
 				<delete file="hosts" />

build.xml

@@ -23,7 +23,6 @@
 		<ant dir="portal-impl" target="clean" inheritAll="false" />
 
 		<ant dir="portal-web" target="clean" inheritAll="false" />
-		<ant dir="tunnel-web" target="clean" inheritAll="false" />
 
 		<ant dir="sql" target="clean" inheritAll="false" />
 
@@ -51,7 +50,6 @@
 			<equals arg1="${app.server.type}" arg2="glassfish" />
 			<then>
 				<delete dir="${app.server.instance.dir}/applications/liferay-portal" />
-				<delete dir="${app.server.instance.dir}/applications/tunnel-web" />
 			</then>
 		</if>
 
@@ -181,7 +179,6 @@ ${app.server.tomcat.dir}, then run "ant -buildfile build-dist.xml unzip-tomcat".
 		<ant dir="portal-impl" target="deploy" inheritAll="false" />
 
 		<ant dir="portal-web" target="deploy" inheritAll="false" />
-		<ant dir="tunnel-web" target="deploy" inheritAll="false" />
 
 		<copy todir="${liferay.home}/data/hsql">
 			<fileset dir="sql">
@@ -899,7 +896,6 @@ set JAVA_OPTS=-Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Djonas.felix
 		<ant dir="portal-impl" target="jar" inheritAll="false" />
 
 		<ant dir="portal-web" target="war" inheritAll="false" />
-		<ant dir="tunnel-web" target="war" inheritAll="false" />
 
 		<ant dir="support-tomcat" target="jar" inheritAll="false" />
 	</target>

portal-client/build.xml

@@ -28,7 +28,7 @@
 			newenvironment="true"
 		>
 			<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
-			<arg value="${project.dir}/tunnel-web/docroot/WEB-INF/server-config.wsdd" />
+			<arg value="${project.dir}/portal-web/docroot/WEB-INF/server-config.wsdd" />
 			<arg value="src" />
 			<arg value="namespace-mapping.properties" />
 			<arg value="${client.url}" />

portal-impl/build.xml

@@ -413,7 +413,7 @@ public class Creole10Parser]]></replacevalue>
 			<arg value="service.api.dir=${basedir}/../portal-service/src" />
 			<arg value="service.impl.dir=${basedir}/src" />
 			<arg value="service.json.file=${basedir}/../portal-web/docroot/html/js/liferay/service.js" />
-			<arg value="service.remoting.file=${basedir}/../tunnel-web/docroot/WEB-INF/remoting-servlet.xml" />
+			<arg value="service.remoting.file=${basedir}/../portal-web/docroot/WEB-INF/remoting-servlet.xml" />
 			<arg value="service.sql.dir=${basedir}/../sql" />
 			<arg value="service.sql.file=portal-tables.sql" />
 			<arg value="service.sql.indexes.file=indexes.sql" />
@@ -699,7 +699,7 @@ public class Creole10Parser]]></replacevalue>
 			<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
 			<jvmarg value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger" />
 			<arg value="wsdd.output.path=src/" />
-			<arg value="wsdd.server.config.file=${basedir}/../tunnel-web/docroot/WEB-INF/server-config.wsdd" />
+			<arg value="wsdd.server.config.file=${basedir}/../portal-web/docroot/WEB-INF/server-config.wsdd" />
 			<arg value="wsdd.service.namespace=Portlet" />
 			<arg value="wsdd.input.file=${service.file}" />
 		</java>

portal-impl/src/com/liferay/portal/servlet/filters/virtualhost/VirtualHostFilter.java

@@ -111,7 +111,8 @@ protected boolean isValidFriendlyURL(String friendlyURL) {
 			friendlyURL.startsWith(_PATH_VTI) ||
 			friendlyURL.startsWith(_PATH_WAP) ||
 			friendlyURL.startsWith(_PATH_WIDGET) ||
-			friendlyURL.startsWith(_PATH_XMLRPC)) {
+			friendlyURL.startsWith(_PATH_XMLRPC) ||
+			friendlyURL.startsWith(_PATH_TUNNEL_WEB)) {
 
 			return false;
 		}
@@ -360,6 +361,8 @@ else if (friendlyURL.startsWith(_PATH_DOCUMENTS)) {
 
 	private static final String _PATH_XMLRPC = "/xmlrpc/";
 
+	private static final String _PATH_TUNNEL_WEB = "/tunnel-web/";
+
 	private static final String _PRIVATE_GROUP_SERVLET_MAPPING =
 		PropsValues.LAYOUT_FRIENDLY_URL_PRIVATE_GROUP_SERVLET_MAPPING;
 

portal-impl/src/com/liferay/portal/tools/servicebuilder/ServiceBuilder.java

@@ -165,7 +165,7 @@ public static void main(String[] args) {
 				"\tservice.api.dir=${project.dir}/portal-service/src\n" +
 				"\tservice.impl.dir=src\n" +
 				"\tservice.json.file=${project.dir}/portal-web/docroot/html/js/liferay/service_unpacked.js\n" +
-				"\tservice.remoting.file=${project.dir}/tunnel-web/docroot/WEB-INF/remoting-servlet.xml\n" +
+				"\tservice.remoting.file=${project.dir}/portal-web/docroot/WEB-INF/remoting-servlet.xml\n" +
 				"\tservice.sql.dir=../sql\n" +
 				"\tservice.sql.file=portal-tables.sql\n" +
 				"\tservice.sql.indexes.file=indexes.sql\n" +