LPS-34658

build-test-ldap.xml

@@ -23,46 +23,39 @@ test.properties to point to an ApacheDS installation file.
 			</then>
 		</if>
 
-		<antcall target="install-vm-java" />
+		<delete dir="${app.server.parent.dir}/apacheds_1.5.7" />
 
-		<echo>Restarting ${vm.host}.</echo>
-
-		<exec dir="${vm.drive}/${vm.host}" executable="${vmware-cmd.executable}">
-			<arg line="${vm.drive}\${vm.host}\${vm.host}.vmx reset" />
-		</exec>
-
-		<sleep seconds="60" />
+		<if>
+			<not>
+				<available file="${app.server.parent.dir}/${apache.directory.win32.zip}" />
+			</not>
+			<then>
+				<mkdir dir="${app.server.parent.dir}" />
 
-		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} ${apache.directory.win32.dir}${apache.directory.win32.zip} ${vm.username}@${vm.host}:/" />
-		</exec>
+				<copy
+					file="${apache.directory.win32.dir}/${apache.directory.win32.zip}"
+					tofile="${app.server.parent.dir}/${apache.directory.win32.zip}"
+				/>
+			</then>
+		</if>
 
-		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${vm.host} ${unzip.executable} -oq C:\${apache.directory.win32.zip} -d C:\" />
-		</exec>
+		<unzip
+			 dest="${app.server.parent.dir}"
+			 src="${app.server.parent.dir}/${apache.directory.win32.zip}"
+		/>
 	</target>
 
 	<target name="run-ldap-tomcat">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="vm.vmdk.suffix" value="alpha-2010-02-02" />
-		 </antcall>
-
 		<antcall target="prepare-ldap-apache" />
 
 		<parallel>
 			<daemons>
-				<echo file="execute-remote-command.bat">
-					cd C:\apacheds_1.5.7
-					apacheds.bat
-				</echo>
-
-				<antcall target="execute-remote-command" />
+				<antcall target="start-ldap" />
 			</daemons>
 
 			<sequential>
 				<waitfor>
-					<socket port="10389" server="${vm.host}" />
+					<socket port="10389" server="localhost" />
 				</waitfor>
 
 				<tstamp>
@@ -127,27 +120,23 @@ cn: usergroup
 uniqueMember: cn=janesmith,ou=users,dc=example,dc=com
 businessCategory: cn=janesmith,ou=users,dc=example,dc=com</echo>
 
-				<exec executable="${pscp.executable}">
-					<arg line="-pw ${vm.password} ${tstamp.value} ${vm.username}@${vm.host}:/" />
+				<exec dir="${app.server.parent.dir}/apacheds_1.5.7/bin" executable="java">
+					<arg value="-jar" />
+					<arg value="apacheds-tools.jar" />
+					<arg value="import" />
+					<arg value="-e" />
+					<arg value="-f" />
+					<arg value="${project.dir}\${tstamp.value}" />
 				</exec>
 
 				<delete file="${tstamp.value}" />
 
-				<echo file="execute-remote-command.bat">
-					cd C:\apacheds_1.5.7\bin
-					java -jar apacheds-tools.jar import -e -f C:/${tstamp.value}
-				</echo>
-
-				<antcall target="execute-remote-command" />
-
 				<ant antfile="build-test-tomcat.xml" target="run-selenium-tomcat">
 					<property name="test.class" value="${test.name}" />
 				</ant>
 			</sequential>
 		</parallel>
 
-		<exec dir="${vm.drive}/${vm.host}" executable="${vmware-cmd.executable}">
-			<arg line="${vm.drive}\${vm.host}\${vm.host}.vmx stop hard" />
-		</exec>
+		<antcall target="stop-ldap" />
 	</target>
 </project>

build-test.xml

@@ -427,7 +427,7 @@
 	</target>
 
 	<target name="build-test-ant-scripts">
-		<property name="build-test-ant-scripts.version" value="4" />
+		<property name="build-test-ant-scripts.version" value="5" />
 
 		<if>
 			<available file="portal-web/test-ant-scripts/version" />
@@ -2463,8 +2463,8 @@
 		<if>
 			<os family="windows" />
 			<then>
-				<exec executable="${shell.executable}">
-					<arg line="/c jps -l > java-processes" />
+				<exec executable="${shell.executable}" output="java-processes">
+					<arg line="/c jps -l" />
 				</exec>
 			</then>
 			<else>
@@ -3707,8 +3707,8 @@ custom.sql.function.isnotnull=CONVERT(VARCHAR,?) IS NOT NULL</echo>
 		<if>
 			<os family="windows" />
 			<then>
-				<exec executable="${shell.executable}">
-					<arg line="/c jps -q > java-processes" />
+				<exec executable="${shell.executable}" output="java-processes">
+					<arg line="/c jps -q" />
 				</exec>
 			</then>
 			<else>
@@ -4084,6 +4084,13 @@ Please set "ie.driver.zip" in test.properties to point to "IEDriverServer_x64_2.
 		</if>
 	</target>
 
+	<target name="start-ldap">
+		<exec dir="${app.server.parent.dir}/apacheds_1.5.7" executable="cmd">
+			<arg value="/c" />
+			<arg value="apacheds.bat" />
+		</exec>
+	</target>
+
 	<target name="start-selenium">
 		<!--<java
 			jar="lib/development/selenium-server.jar"
@@ -4112,6 +4119,55 @@ Please set "ie.driver.zip" in test.properties to point to "IEDriverServer_x64_2.
 		</exec>
 	</target>
 
+	<target name="stop-ldap">
+		<if>
+			<os family="windows" />
+			<then>
+				<exec executable="${shell.executable}">
+					<arg line="/c jps -l > java-processes" />
+				</exec>
+			</then>
+			<else>
+				<exec executable="${shell.executable}" output="java-processes">
+					<arg line="-c jps -l" />
+				</exec>
+			</else>
+		</if>
+
+		<loadfile property="java-processes.content" srcfile="java-processes" />
+
+		<delete file="java-processes" />
+
+		<script classpathref="project.classpath" language="beanshell">
+			String javaProcessesNewContent = project.getProperty("java-processes.content");
+
+			if (javaProcessesNewContent.contains("File Not Found")) {
+				javaProcessesNewContent = "";
+			}
+
+			String javaProcessList = javaProcessesNewContent.replaceAll("\r\n", ",");
+
+			if (javaProcessList.endsWith(",")) {
+				javaProcessList = javaProcessList.substring(0, javaProcessList.length() - 1);
+			}
+
+			project.setProperty("java.process.list", javaProcessList);
+		</script>
+
+		<for list="${java.process.list}" param="java.process">
+			<sequential>
+				<if>
+					<contains string="@{java.process}" substring="org.apache.directory.server.UberjarMain" />
+					<then>
+						<antcall target="kill-java-process">
+							<param name="java.process.to.kill" value="@{java.process}" />
+						</antcall>
+					</then>
+				</if>
+			</sequential>
+		</for>
+	</target>
+
 	<target name="stop-selenium">
 		<antelope:post to="http://localhost:14444/selenium-server/driver/?cmd=shutDownSeleniumServer" wantresponse="true" />
 	</target>

definitions/liferay-hook_6_2_0.dtd

@@ -72,6 +72,7 @@ layout.user.public.layouts.power.user.required
 ldap.attrs.transformer.impl
 locales
 locales.beta
+locales.enabled
 lock.listeners
 login.create.account.allow.custom.password
 login.events.post

osgi/bootstrap/src/com/liferay/osgi/bootstrap/ModuleFrameworkImpl.java

@@ -44,8 +44,6 @@
 import com.liferay.portal.util.ClassLoaderUtil;
 import com.liferay.portal.util.PropsValues;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -56,6 +54,7 @@
 import java.net.URLConnection;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -667,21 +666,20 @@ private String _getSystemPackagesExtra() {
 
 		ClassLoader classLoader = ClassLoaderUtil.getPortalClassLoader();
 
-		Enumeration<URL> enu = Collections.enumeration(Collections.emptyList());
-
 		try {
-			enu = classLoader.getResources("META-INF/MANIFEST.MF");
+			Enumeration<URL> enu = classLoader.getResources(
+				"META-INF/MANIFEST.MF");
+
+			while (enu.hasMoreElements()) {
+				URL url = enu.nextElement();
+
+				urls.add(url);
+			}
 		}
 		catch (IOException ioe) {
 			_log.error(ioe, ioe);
 		}
 
-		while (enu.hasMoreElements()) {
-			URL url = enu.nextElement();
-
-			urls.add(url);
-		}
-
 		for (URL url : urls) {
 			_processURL(
 				sb, url,