Author: massi
Date: Wed Jul 2 13:59:19 2014
New Revision: 1607368
URL: http://svn.apache.org/r1607368
Log:
Fixed #SYNCOPE-521
Modified:
syncope/trunk/installer/pom.xml
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java
syncope/trunk/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
syncope/trunk/installer/src/main/resources/izpack/install.xml
syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_eng
syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_ita
syncope/trunk/installer/src/main/resources/izpack/userInputSpec.xml
Modified: syncope/trunk/installer/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/pom.xml?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
--- syncope/trunk/installer/pom.xml (original)
+++ syncope/trunk/installer/pom.xml Wed Jul 2 13:59:19 2014
@@ -55,8 +55,16 @@ under the License.
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-panel</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </dependency>
- <!--DB DRIVERS-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
@@ -67,14 +75,7 @@ under the License.
<artifactId>mysql-connector-java</artifactId>
<version>5.1.31</version>
</dependency>
- <!--DB DRIVERS-->
- <!-- JBOSS -->
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
@@ -85,7 +86,7 @@ under the License.
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified:
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
---
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java
(original)
+++
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/Tomcat.java
Wed Jul 2 13:59:19 2014
@@ -23,12 +23,10 @@ import org.apache.syncope.installer.util
public class Tomcat {
private static final String DEPLOY_SYNCOPE_CORE_QUERY
- =
"%s/manager/text/deploy?path=/syncope&war=file:%s/%s/core/target/syncope.war";
+ =
"/manager/text/deploy?path=/syncope&war=file:%s/%s/core/target/syncope.war";
private static final String DEPLOY_SYNCOPE_CONSOLE_QUERY
- =
"%s/manager/text/deploy?path=/syncope-console&war=file:%s/%s/console/target/syncope-console.war";
-
- private final String tomcatUrl;
+ =
"/manager/text/deploy?path=/syncope-console&war=file:%s/%s/console/target/syncope-console.war";
private final String installPath;
@@ -36,22 +34,20 @@ public class Tomcat {
private final HttpUtils httpUtils;
- public Tomcat(String tomcatUrl, String installPath, String artifactId,
String tomcatUser, String tomcatPassword) {
- this.tomcatUrl = tomcatUrl;
+ public Tomcat(final String tomcatHost, final String tomcatPort, final
String installPath, final String artifactId,
+ final String tomcatUser, final String tomcatPassword) {
this.installPath = installPath;
this.artifactId = artifactId;
- httpUtils = new HttpUtils(tomcatUser, tomcatPassword);
+ httpUtils = new HttpUtils(tomcatHost, tomcatPort, tomcatUser,
tomcatPassword);
}
public boolean deployCore() {
- int status = httpUtils.getWithBasicAuth(
- String.format(DEPLOY_SYNCOPE_CORE_QUERY, tomcatUrl,
installPath, artifactId));
+ int status =
httpUtils.getWithBasicAuth(String.format(DEPLOY_SYNCOPE_CORE_QUERY,
installPath, artifactId));
return status == 200;
}
public boolean deployConsole() {
- int status = httpUtils.getWithBasicAuth(
- String.format(DEPLOY_SYNCOPE_CONSOLE_QUERY, tomcatUrl,
installPath, artifactId));
+ int status =
httpUtils.getWithBasicAuth(String.format(DEPLOY_SYNCOPE_CONSOLE_QUERY,
installPath, artifactId));
return status == 200;
}
}
Modified:
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
---
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java
(original)
+++
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/containers/jboss/JBoss.java
Wed Jul 2 13:59:19 2014
@@ -48,7 +48,7 @@ public class JBoss {
this.jbossPort = jbossPort;
this.installPath = installPath;
this.artifactId = artifactId;
- httpUtils = new HttpUtils(jbossAdminUsername, jbossAdminPassword);
+ httpUtils = new HttpUtils(jbossHost, jbossPort, jbossAdminUsername,
jbossAdminPassword);
}
@@ -70,8 +70,9 @@ public class JBoss {
final JBossDeployRequestContent jBossDeployRequestContent = new
JBossDeployRequestContent(
jBossAddResponse.getResult().getBYTES_VALUE(), warName);
- int status = httpUtils.postWithStringEntity(String.format(enableUrl,
jbossHost, jbossPort),
-
JsonUtils.jBossDeployRequestContent(jBossDeployRequestContent));
+ int status = httpUtils.
+ postWithStringEntity(String.format(enableUrl, jbossHost,
jbossPort),
+
JsonUtils.jBossDeployRequestContent(jBossDeployRequestContent));
return status == 200;
}
}
Modified:
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
---
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
(original)
+++
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
Wed Jul 2 13:59:19 2014
@@ -40,7 +40,9 @@ public class ContainerProcess extends Ab
private String tomcatPassword;
- private String tomcatUrl;
+ private String tomcatHost;
+
+ private String tomcatPort;
private String glassfishDir;
@@ -65,18 +67,19 @@ public class ContainerProcess extends Ab
installPath = args[0];
artifactId = args[1];
final Containers selectedContainer =
Containers.fromContainerName(args[2]);
- tomcatUrl = args[3];
- tomcatUser = args[4];
- tomcatPassword = args[5];
- glassfishDir = args[6];
- logsDirectory = args[7];
- bundlesDirectory = args[8];
- withDataSource = Boolean.valueOf(args[9]);
- jbossHost = args[10];
- jbossPort = args[11];
- jbossJdbcModuleName = args[12];
- jbossAdminUsername = args[13];
- jbossAdminPassword = args[14];
+ tomcatHost = args[3];
+ tomcatPort = args[4];
+ tomcatUser = args[5];
+ tomcatPassword = args[6];
+ glassfishDir = args[7];
+ logsDirectory = args[8];
+ bundlesDirectory = args[9];
+ withDataSource = Boolean.valueOf(args[10]);
+ jbossHost = args[11];
+ jbossPort = args[12];
+ jbossJdbcModuleName = args[13];
+ jbossAdminUsername = args[14];
+ jbossAdminPassword = args[15];
if (withDataSource) {
writeToFile(new File(installPath + "/" + artifactId +
WebXml.PATH), WebXml.withDataSource());
@@ -100,8 +103,8 @@ public class ContainerProcess extends Ab
switch (selectedContainer) {
case TOMCAT:
- final Tomcat tomcat = new Tomcat(tomcatUrl, installPath,
artifactId, tomcatUser, tomcatPassword);
-
+ final Tomcat tomcat = new Tomcat(
+ tomcatHost, tomcatPort, installPath, artifactId,
tomcatUser, tomcatPassword);
boolean deployCoreResult = tomcat.deployCore();
if (deployCoreResult) {
handler.logOutput("Core successfully deployed ", true);
Modified:
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
---
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
(original)
+++
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
Wed Jul 2 13:59:19 2014
@@ -20,46 +20,62 @@ package org.apache.syncope.installer.uti
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthPolicy;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.httpclient.methods.multipart.FilePart;
-import org.apache.commons.httpclient.methods.multipart.FilePartSource;
-import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
-import org.apache.commons.httpclient.methods.multipart.Part;
-import org.apache.commons.httpclient.methods.multipart.PartSource;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScheme;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.auth.DigestScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
public class HttpUtils {
- private static final String APPLICATION_JSON = "application/json";
+ private static final String URL_TEMPLATE = "http://%s:%s";;
- private static final String MULTIPART_FORM_DATA = "multipart/form-data";
+ private final CloseableHttpClient httpClient;
- private static final String UTF_8 = "UTF-8";
+ private final String host;
- private final HttpClient httpClient;
+ private final int port;
- public HttpUtils(final String username, final String password) {
- httpClient = new HttpClient();
- httpClient.getParams().setAuthenticationPreemptive(true);
- httpClient.getState().setCredentials(AuthScope.ANY, new
UsernamePasswordCredentials(username, password));
+ private final String username;
+
+ private final String password;
+
+ private final HttpHost targetHost;
+
+ public HttpUtils(final String host, final String port, final String
username, final String password) {
+ httpClient = HttpClients.createDefault();
+ this.username = username;
+ this.password = password;
+ this.host = host;
+ this.port = Integer.valueOf(port);
+ this.targetHost = new HttpHost(this.host, this.port);
}
- public int getWithBasicAuth(final String url) {
- final HttpMethod method = new GetMethod(url);
- final List authPrefs = new ArrayList();
- authPrefs.add(AuthPolicy.BASIC);
- httpClient.getParams().setParameter(AuthPolicy.BASIC, authPrefs);
+ public int getWithBasicAuth(final String path) {
+ final HttpGet httpGet = new HttpGet(String.format(URL_TEMPLATE, host,
port) + path);
int status = 0;
try {
- status = httpClient.executeMethod(method);
+ final CloseableHttpResponse response = httpClient.execute(
+ targetHost, httpGet, setAuth(targetHost, new
BasicScheme()));
+ status = response.getStatusLine().getStatusCode();
+ response.close();
} catch (IOException ex) {
}
return status;
@@ -68,33 +84,55 @@ public class HttpUtils {
public String postWithDigestAuth(final String url, final String file) {
String responseBodyAsString = "";
try {
- final PostMethod addContentPost = new PostMethod(url);
- final PartSource partSource = new FilePartSource(new File(file));
-
- final String[] tmp = file.split("/");
- final String fileName = tmp[tmp.length - 1].split("\\.")[0];
- final Part[] parts = {new FilePart(fileName, partSource,
MULTIPART_FORM_DATA, UTF_8)};
- final MultipartRequestEntity mre = new
MultipartRequestEntity(parts, addContentPost.getParams());
- addContentPost.setRequestEntity(mre);
- final List authPrefs = new ArrayList();
- authPrefs.add(AuthPolicy.DIGEST);
-
-
httpClient.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
- httpClient.executeMethod(addContentPost);
- responseBodyAsString = addContentPost.getResponseBodyAsString();
- } catch (IOException ioe) {
+ final CloseableHttpResponse response =
httpClient.execute(targetHost,
+ httpPost(url,
MultipartEntityBuilder.create().addPart("bin", new FileBody(new
File(file))).build()),
+ setAuth(targetHost, new DigestScheme()));
+ responseBodyAsString =
IOUtils.toString(response.getEntity().getContent());
+ response.close();
+ } catch (IOException ex) {
}
+
return responseBodyAsString;
}
public int postWithStringEntity(final String url, final String
stringEntity) {
int status = 0;
try {
- final StringRequestEntity requestEntity = new
StringRequestEntity(stringEntity, APPLICATION_JSON, UTF_8);
- final PostMethod enablePost = new PostMethod(url);
- enablePost.setRequestEntity(requestEntity);
- status = httpClient.executeMethod(enablePost);
- } catch (IOException uee) {
+ final HttpPost httPost = httpPost(url, new
StringEntity(stringEntity));
+ httPost.addHeader("Content-Type",
ContentType.APPLICATION_JSON.getMimeType());
+ final CloseableHttpResponse response = httpClient.execute(
+ targetHost, httPost, setAuth(targetHost, new
DigestScheme()));
+ status = response.getStatusLine().getStatusCode();
+ response.close();
+ } catch (IOException ioe) {
+ }
+ return status;
+ }
+
+ private HttpClientContext setAuth(final HttpHost targetHost, final
AuthScheme authScheme) {
+ final CredentialsProvider credsProvider = new
BasicCredentialsProvider();
+ credsProvider.setCredentials(new AuthScope(targetHost.getHostName(),
targetHost.getPort()),
+ new UsernamePasswordCredentials(username, password));
+ final HttpClientContext context = HttpClientContext.create();
+ final AuthCache authCache = new BasicAuthCache();
+ authCache.put(targetHost, authScheme);
+ context.setAuthCache(authCache);
+ context.setCredentialsProvider(credsProvider);
+ return context;
+ }
+
+ private HttpPost httpPost(final String url, final HttpEntity reqEntity) {
+ final HttpPost httppost = new HttpPost(url);
+ httppost.setEntity(reqEntity);
+ return httppost;
+ }
+
+ public static int ping(final String host, final String port) {
+ int status = 0;
+ try {
+ status = HttpClients.createDefault().execute(
+ new HttpGet(String.format(URL_TEMPLATE, host,
port))).getStatusLine().getStatusCode();
+ } catch (IOException ioe) {
}
return status;
}
Modified:
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
---
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java
(original)
+++
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/validators/ContainerValidator.java
Wed Jul 2 13:59:19 2014
@@ -20,10 +20,8 @@ package org.apache.syncope.installer.val
import com.izforge.izpack.api.data.InstallData;
import java.io.File;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
import org.apache.syncope.installer.enums.Containers;
+import org.apache.syncope.installer.utilities.HttpUtils;
public class ContainerValidator extends AbstractValidator {
@@ -34,7 +32,8 @@ public class ContainerValidator extends
final Containers selectedContainer = Containers.fromContainerName(
installData.getVariable("install.container.selection"));
- final String tomcatUrl =
installData.getVariable("tomcat.container.url");
+ final String tomcatHost =
installData.getVariable("tomcat.container.host");
+ final String tomcatPort =
installData.getVariable("tomcat.container.port");
final String tomcatUser =
installData.getVariable("tomcat.container.user");
final String tomcatPassword =
installData.getVariable("tomcat.container.pwd");
final String glassfishDir =
installData.getVariable("glassfish.container.dir");
@@ -49,8 +48,12 @@ public class ContainerValidator extends
boolean verified = true;
error = new StringBuilder("Required fields:\n");
- if (isEmpty(tomcatUrl)) {
- error.append("Tomcat URL\n");
+ if (isEmpty(tomcatHost)) {
+ error.append("Tomcat host\n");
+ verified = false;
+ }
+ if (isEmpty(tomcatPort)) {
+ error.append("Tomcat port\n");
verified = false;
}
if (isEmpty(tomcatUser)) {
@@ -66,14 +69,7 @@ public class ContainerValidator extends
return Status.ERROR;
}
- int responseCode = 0;
-
- try {
- final HttpURLConnection connection = (HttpURLConnection)
new URL(tomcatUrl).openConnection();
- responseCode = connection.getResponseCode();
- } catch (final IOException ex) {
-
- }
+ int responseCode = HttpUtils.ping(tomcatHost, tomcatPort);
if (responseCode == 200) {
return Status.OK;
@@ -109,15 +105,7 @@ public class ContainerValidator extends
return Status.ERROR;
}
- int jResponseCode = 0;
-
- try {
- final HttpURLConnection connection = (HttpURLConnection)
new URL(
- "http://"; + jbossHost + ":" +
jbossPort).openConnection();
- jResponseCode = connection.getResponseCode();
- } catch (final IOException ex) {
-
- }
+ int jResponseCode = HttpUtils.ping(jbossHost, jbossPort);
if (jResponseCode == 200) {
return Status.OK;
Modified:
syncope/trunk/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/ProcessPanel.Spec.xml?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
(original)
+++ syncope/trunk/installer/src/main/resources/izpack/ProcessPanel.Spec.xml Wed
Jul 2 13:59:19 2014
@@ -19,7 +19,7 @@ under the License.
-->
<processing>
<logfiledir>$INSTALL_PATH</logfiledir>
- <job name="archetype">
+ <job name="Archetype creation...">
<executeclass
name="org.apache.syncope.installer.processes.ArchetypeProcess">
<arg>$INSTALL_PATH</arg>
<arg>$mvn.groupid</arg>
@@ -32,7 +32,7 @@ under the License.
<arg>$mvn.syncope.admin.password</arg>
</executeclass>
</job>
- <job name="persistence">
+ <job name="Persistence configuration...">
<executeclass
name="org.apache.syncope.installer.processes.PersistenceProcess">
<arg>$INSTALL_PATH</arg><!-- 0 -->
<arg>$mvn.artifactid</arg><!-- 1 -->
@@ -44,23 +44,24 @@ under the License.
<arg>$persistence.tablespace</arg><!-- 7 -->
</executeclass>
</job>
- <job name="container">
+ <job name="Deploy...">
<executeclass
name="org.apache.syncope.installer.processes.ContainerProcess">
<arg>$INSTALL_PATH</arg><!-- 0 -->
<arg>$mvn.artifactid</arg><!-- 1 -->
<arg>$install.container.selection</arg><!-- 2 -->
- <arg>$tomcat.container.url</arg><!-- 3 -->
- <arg>$tomcat.container.user</arg><!-- 4 -->
- <arg>$tomcat.container.pwd</arg><!-- 5 -->
- <arg>$glassfish.container.dir</arg><!-- 6 -->
- <arg>$mvn.log.directory</arg><!-- 7 -->
- <arg>$mvn.bundle.directory</arg><!-- 8 -->
- <arg>$with.datasuorce</arg><!-- 9 -->
- <arg>$jboss.container.host</arg><!-- 10 -->
- <arg>$jboss.container.port</arg><!-- 11 -->
- <arg>$jboss.container.jdbc.module</arg><!-- 12 -->
- <arg>$jboss.container.user</arg><!-- 13 -->
- <arg>$jboss.container.pwd</arg><!-- 14 -->
+ <arg>$tomcat.container.host</arg><!-- 3 -->
+ <arg>$tomcat.container.port</arg><!-- 4 -->
+ <arg>$tomcat.container.user</arg><!-- 5 -->
+ <arg>$tomcat.container.pwd</arg><!-- 6 -->
+ <arg>$glassfish.container.dir</arg><!-- 7 -->
+ <arg>$mvn.log.directory</arg><!-- 8 -->
+ <arg>$mvn.bundle.directory</arg><!-- 9 -->
+ <arg>$with.datasuorce</arg><!-- 10 -->
+ <arg>$jboss.container.host</arg><!-- 11 -->
+ <arg>$jboss.container.port</arg><!-- 12 -->
+ <arg>$jboss.container.jdbc.module</arg><!-- 13 -->
+ <arg>$jboss.container.user</arg><!-- 14 -->
+ <arg>$jboss.container.pwd</arg><!-- 15 -->
</executeclass>
</job>
<onFail previous="true" next="false" />
Modified: syncope/trunk/installer/src/main/resources/izpack/install.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/install.xml?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/install.xml (original)
+++ syncope/trunk/installer/src/main/resources/izpack/install.xml Wed Jul 2
13:59:19 2014
@@ -136,8 +136,11 @@ under the License.
<jar src="lib/postgresql-9.3-1101-jdbc41.jar"/>
<jar src="lib/mysql-connector-java-5.1.31.jar"/>
<jar src="lib/commons-logging-1.1.3.jar"/>
- <jar src="lib/commons-httpclient-3.1.jar"/>
<jar src="lib/commons-codec-1.9.jar"/>
+ <jar src="lib/commons-io-2.4.jar"/>
+ <jar src="lib/httpclient-4.3.4.jar"/>
+ <jar src="lib/httpmime-4.3.4.jar"/>
+ <jar src="lib/httpcore-4.3.2.jar"/>
<jar src="lib/jackson-core-asl-1.9.13.jar"/>
<jar src="lib/jackson-mapper-asl-1.9.13.jar"/>
Modified:
syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_eng
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_eng?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_eng
(original)
+++ syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_eng Wed
Jul 2 13:59:19 2014
@@ -35,7 +35,8 @@ under the License.
<str id="with.datasuorce.id" txt="DataSource with JNDI name
'java:/syncopeDataSource':"/>
- <str id="tomcat.container.url.id" txt="Tomcat URL:"/>
+ <str id="tomcat.container.host.id" txt="Tomcat host:"/>
+ <str id="tomcat.container.port.id" txt="Tomcat port:"/>
<str id="tomcat.container.user.id" txt="Tomcat username:"/>
<str id="tomcat.container.pwd.id" txt="Tomcat password:"/>
Modified:
syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_ita
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_ita?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_ita
(original)
+++ syncope/trunk/installer/src/main/resources/izpack/userInputLang.xml_ita Wed
Jul 2 13:59:19 2014
@@ -35,7 +35,8 @@ under the License.
<str id="with.datasuorce.id" txt="DataSource with JNDI name
'java:/syncopeDataSource':"/>
- <str id="tomcat.container.url.id" txt="Tomcat URL:"/>
+ <str id="tomcat.container.host.id" txt="Tomcat host:"/>
+ <str id="tomcat.container.port.id" txt="Tomcat port:"/>
<str id="tomcat.container.user.id" txt="Tomcat username:"/>
<str id="tomcat.container.pwd.id" txt="Tomcat password:"/>
Modified: syncope/trunk/installer/src/main/resources/izpack/userInputSpec.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/userInputSpec.xml?rev=1607368&r1=1607367&r2=1607368&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/userInputSpec.xml
(original)
+++ syncope/trunk/installer/src/main/resources/izpack/userInputSpec.xml Wed Jul
2 13:59:19 2014
@@ -138,8 +138,12 @@ under the License.
<field type="divider"/>
<field type="space"/>
- <field type="text" variable="tomcat.container.url"
conditionid="tomcat.choice">
- <spec id="tomcat.container.url.id" size="20"
set="http://localhost:8080/"/>
+ <field type="text" variable="tomcat.container.host"
conditionid="tomcat.choice">
+ <spec id="tomcat.container.host.id" size="20" set="localhost"/>
+ </field>
+ <field type="space"/>
+ <field type="text" variable="tomcat.container.port"
conditionid="tomcat.choice">
+ <spec id="tomcat.container.port.id" size="20" set="8080"/>
</field>
<field type="space"/>
<field type="text" variable="tomcat.container.user"
conditionid="tomcat.choice">
