1.1 --- a/logger/external/build.xml Tue Feb 21 10:37:42 2017 +0100
1.2 +++ b/logger/external/build.xml Mon Mar 06 16:21:11 2017 +0100
1.3 @@ -51,20 +51,20 @@
1.4 <target name="default" depends="libs"/>
1.5
1.6 <target name="derby" depends="-init-proxy" unless="derby.downloaded">
1.7 - <get dest="derby-10.3.2.1.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/org.apache.derby/jars/derby-10.3.2.1.jar"/>
1.8 + <get dest="derby-10.3.2.1.jar" src="http://maven.ibiblio.org/maven/org.apache.derby/jars/derby-10.3.2.1.jar"/>
1.9 </target>
1.10
1.11 <target name="libs" depends="servlet,derby,commons,hibernate,tomcat,nbjars,junit,selenium,jersey,jaxb" />
1.12
1.13 <condition property="servlet.downloaded">
1.14 <and>
1.15 - <available file="servlet-2.4.jar"/>
1.16 + <available file="servlet-api-3.0.jar"/>
1.17 <available file="jsp-api-2.0.jar"/>
1.18 </and>
1.19 </condition>
1.20 <target name="servlet" depends="-init-proxy" unless="servlet.downloaded">
1.21 - <get dest="servlet-2.4.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven2/servletapi/servlet-api/2.4/servlet-api-2.4.jar"/>
1.22 - <get dest="jsp-api-2.0.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven2/jspapi/jsp-api/2.0/jsp-api-2.0.jar"/>
1.23 + <get dest="servlet-api-3.0.jar" src="http://central.maven.org/maven2/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar"/>
1.24 + <get dest="jsp-api-2.0.jar" src="http://maven.ibiblio.org/maven2/jspapi/jsp-api/2.0/jsp-api-2.0.jar"/>
1.25 </target>
1.26
1.27 <condition property="commons.downloaded">
1.28 @@ -84,17 +84,17 @@
1.29 </condition>
1.30
1.31 <target name="commons" depends="-init-proxy" unless="commons.downloaded">
1.32 - <get dest="commons-httpclient-3.1.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
1.33 - <get dest="commons-codec-1.3.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/commons-codec/jars/commons-codec-1.3.jar"/>
1.34 - <get dest="struts-1.2.9.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/struts/jars/struts-1.2.9.jar"/>
1.35 - <get dest="commons-beanutils-1.7.0.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar"/>
1.36 - <get dest="commons-digester-1.8.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/commons-digester/jars/commons-digester-1.8.jar"/>
1.37 - <get dest="commons-validator-1.3.1.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/commons-validator/jars/commons-validator-1.3.1.jar"/>
1.38 - <get dest="commons-logging-1.1.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/commons-logging/jars/commons-logging-1.1.jar"/>
1.39 - <get dest="jstl-1.1.2.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/jstl/jars/jstl-1.1.2.jar"/>
1.40 - <get dest="standard-1.1.2.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven/taglibs/jars/standard-1.1.2.jar"/>
1.41 - <get dest="mail.jar" src="http://download.java.net/maven/2/javax/mail/mail/1.4.4-SNAPSHOT/mail-1.4.4-SNAPSHOT.jar"/>
1.42 - <get dest="json_simple.jar" src="https://json-simple.googlecode.com/files/json_simple.jar"/>
1.43 + <get dest="commons-httpclient-3.1.jar" src="http://central.maven.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
1.44 + <get dest="commons-codec-1.3.jar" src="http://central.maven.org/maven/commons-codec/jars/commons-codec-1.3.jar"/>
1.45 + <get dest="struts-1.2.9.jar" src="http://central.maven.org/maven/struts/jars/struts-1.2.9.jar"/>
1.46 + <get dest="commons-beanutils-1.7.0.jar" src="http://central.maven.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar"/>
1.47 + <get dest="commons-digester-1.8.jar" src="http://central.maven.org/maven/commons-digester/jars/commons-digester-1.8.jar"/>
1.48 + <get dest="commons-validator-1.3.1.jar" src="http://central.maven.org/maven/commons-validator/jars/commons-validator-1.3.1.jar"/>
1.49 + <get dest="commons-logging-1.1.jar" src="http://central.maven.org/maven/commons-logging/jars/commons-logging-1.1.jar"/>
1.50 + <get dest="jstl-1.1.2.jar" src="http://central.maven.org/maven/jstl/jars/jstl-1.1.2.jar"/>
1.51 + <get dest="standard-1.1.2.jar" src="http://central.maven.org/maven/taglibs/jars/standard-1.1.2.jar"/>
1.52 + <get dest="mail.jar" src="http://central.maven.org/maven2/javax/mail/mail/1.4.4/mail-1.4.4.jar"/>
1.53 + <get dest="json_simple.jar" src="http://central.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar"/>
1.54 </target>
1.55
1.56 <condition property="hibernate.downloaded">
1.57 @@ -144,9 +144,9 @@
1.58 <get dest="hibernate-ehcache-4.1.9.Final.jar" src="http://repo.maven.apache.org/maven2/org/hibernate/hibernate-ehcache/4.1.9.Final/hibernate-ehcache-4.1.9.Final.jar"/>
1.59 <get dest="logback-classic-1.0.13.jar" src="http://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.0.13/logback-classic-1.0.13.jar"/>
1.60 <get dest="logback-core-1.0.13.jar" src="http://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.0.13/logback-core-1.0.13.jar"/>
1.61 - <get dest="cglib.jar" src="https://repository.jboss.org/nexus/content/groups/public-jboss/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
1.62 + <get dest="cglib.jar" src="http://central.maven.org/maven2/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
1.63 <get dest="antlr.jar" src="http://repo1.maven.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
1.64 - <get dest="jta.jar" src="https://maven.nuxeo.org/nexus/content/groups/public/jta/jta/1.0.1/jta-1.0.1.jar"/>
1.65 + <get dest="jta.jar" src="http://www.java2s.com/Code/JarDownload/jta/jta-1.0.1.jar.zip"/>
1.66 </target>
1.67
1.68 <condition property="selenium.downloaded">
1.69 @@ -154,7 +154,7 @@
1.70 </condition>
1.71
1.72 <target name="selenium" depends="-init-proxy" unless="selenium.downloaded">
1.73 - <get dest="selenium-java-client-driver-0.9.2.jar" src="http://nexus.openqa.org/content/repositories/releases/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.jar"/>
1.74 + <get dest="selenium-java-client-driver-0.9.2.jar" src="http://maven.onehippo.com/maven2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.jar"/>
1.75 </target>
1.76
1.77 <condition property="toplink.downloaded">
1.78 @@ -190,7 +190,7 @@
1.79 </condition>
1.80
1.81 <target name="junit" depends="-init-proxy" unless="junit.downloaded">
1.82 - <get dest="junit-4.1.jar" src="http://mirrors.ibiblio.org/pub/mirrors/maven2/junit/junit/4.1/junit-4.1.jar"/>
1.83 + <get dest="junit-4.1.jar" src="http://central.maven.org/maven2/junit/junit/4.1/junit-4.1.jar"/>
1.84 </target>
1.85
1.86 <condition property="jersey.downloaded">
1.87 @@ -207,8 +207,8 @@
1.88
1.89 <target name="jersey" depends="-init-proxy" unless="jersey.downloaded">
1.90 <get dest="asm-3.1.jar" src="http://repo1.maven.org/maven2/asm/asm/3.1/asm-3.1.jar"/>
1.91 - <get dest="jersey-bundle-1.9-ea04.jar" src="http://download.java.net/maven/2/com/sun/jersey/jersey-bundle/1.9-ea04/jersey-bundle-1.9-ea04.jar"/>
1.92 - <get dest="jsr311-api-1.1.jar" src="http://download.java.net/maven/2/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar"/>
1.93 + <get dest="jersey-bundle-1.9-ea04.jar" src="http://central.maven.org/maven2/com/sun/jersey/jersey-bundle/1.9-ea04/jersey-bundle-1.9-ea04.jar"/>
1.94 + <get dest="jsr311-api-1.1.jar" src="http://central.maven.org/maven2/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar"/>
1.95 <get dest="jackson-core-asl-1.9.9.jar" src="http://repo1.maven.org/maven2/org/codehaus/jackson/jackson-core-asl/1.9.9/jackson-core-asl-1.9.9.jar"/>
1.96 <get dest="jackson-mapper-asl-1.9.9.jar" src="http://repo1.maven.org/maven2/org/codehaus/jackson/jackson-mapper-asl/1.9.9/jackson-mapper-asl-1.9.9.jar"/>
1.97 <get dest="jackson-xc-1.9.9.jar" src="http://repo1.maven.org/maven2/org/codehaus/jackson/jackson-xc/1.9.9/jackson-xc-1.9.9.jar"/>
1.98 @@ -227,10 +227,10 @@
1.99 </condition>
1.100
1.101 <target name="jaxb" depends="-init-proxy" unless="jaxb.downloaded">
1.102 - <get dest="jaxb-impl-2.1.12.jar" src="http://download.java.net/maven/1/com.sun.xml.bind/jars/jaxb-impl-2.1.12.jar"/>
1.103 - <get dest="jaxb-api-2.1.jar" src="http://download.java.net/maven/1/javax.xml.bind/jars/jaxb-api-2.1.jar"/>
1.104 - <get dest="stax-api-1.0-2.jar" src="http://download.java.net/maven/1/javax.xml.stream/jars/stax-api-1.0-2.jar"/>
1.105 - <get dest="activation-1.1.jar" src="http://download.java.net/maven/1/javax.activation/jars/activation-1.1.jar"/>
1.106 + <get dest="jaxb-impl-2.1.12.jar" src="http://central.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar"/>
1.107 + <get dest="jaxb-api-2.1.jar" src="http://central.maven.org/maven2/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
1.108 + <get dest="stax-api-1.0-2.jar" src="http://central.maven.org/maven2/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
1.109 + <get dest="activation-1.1.jar" src="http://central.maven.org/maven2/javax/activation/activation/1.1/activation-1.1.jar"/>
1.110 </target>
1.111
1.112 <condition property="nbjars.downloaded">
2.1 --- a/logger/nbsso/src/org/netbeans/web/sso/SSOPrincipal.java Tue Feb 21 10:37:42 2017 +0100
2.2 +++ b/logger/nbsso/src/org/netbeans/web/sso/SSOPrincipal.java Mon Mar 06 16:21:11 2017 +0100
2.3 @@ -15,6 +15,6 @@
2.4 public class SSOPrincipal extends GenericPrincipal {
2.5
2.6 public SSOPrincipal(Realm realm, String name, List roles) {
2.7 - super(realm, name, "", roles);
2.8 + super(name, "", roles);
2.9 }
2.10 }
3.1 --- a/logger/uihandlerserver/build-before-profiler.xml Tue Feb 21 10:37:42 2017 +0100
3.2 +++ b/logger/uihandlerserver/build-before-profiler.xml Mon Mar 06 16:21:11 2017 +0100
3.3 @@ -175,7 +175,7 @@
3.4 <target name="-tomcat-properties" depends="init,-copy-tomcat-base" unless="tomcat.home">
3.5 <property name="tomcat.home" location="../external/apache-tomcat-7.0.64/"/>
3.6
3.7 - <property name="tomcat.port" value="80"/>
3.8 + <property name="tomcat.port" value="8888"/>
3.9 <property name="tomcat.debug.port" value="8889"/>
3.10 <property name="tomcat.debug.suspend" value="n"/>
3.11 <property name="tomcat.host" value="localhost"/>
4.1 --- a/logger/uihandlerserver/build.xml Tue Feb 21 10:37:42 2017 +0100
4.2 +++ b/logger/uihandlerserver/build.xml Mon Mar 06 16:21:11 2017 +0100
4.3 @@ -141,9 +141,13 @@
4.4 </target>
4.5
4.6 <target name="deploy" depends="-tomcat-properties,build-all,start-tomcat">
4.7 - <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"
4.8 - classpath="${tomcat.home}/lib/catalina-ant.jar"/>
4.9 -
4.10 + <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask">
4.11 + <classpath>
4.12 + <pathelement location="${tomcat.home}/lib/catalina-ant.jar"/>
4.13 + <pathelement location="${tomcat.home}/lib/tomcat-coyote.jar"/>
4.14 + <pathelement location="${tomcat.home}/lib/tomcat-util.jar"/>
4.15 + </classpath>
4.16 + </taskdef>
4.17 <deploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
4.18 password="${tomcat.password}" path="/analytics"
4.19 war="${basedir}/dist/analytics.war" update="true"/>
4.20 @@ -176,7 +180,7 @@
4.21
4.22 <target name="-tomcat-properties" depends="init,-copy-tomcat-base" unless="tomcat.home">
4.23 <property name="tomcat.home" location="../external/apache-tomcat-7.0.64/"/>
4.24 - <property name="tomcat.port" value="80"/>
4.25 + <property name="tomcat.port" value="8888"/>
4.26 <property name="tomcat.debug.port" value="8889"/>
4.27 <property name="tomcat.debug.suspend" value="n"/>
4.28 <property name="tomcat.host" value="localhost"/>
4.29 @@ -287,8 +291,14 @@
4.30
4.31 <target name="undeploy" depends="-check-tomcat" if="analytics.deployed, tomcat.running">
4.32 <echo message="Undeploying analytics"/>
4.33 - <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask"
4.34 - classpath="${tomcat.home}/lib/catalina-ant.jar"/>
4.35 + <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask">
4.36 + <classpath>
4.37 + <pathelement location="${tomcat.home}/lib/catalina-ant.jar"/>
4.38 + <pathelement location="${tomcat.home}/lib/tomcat-coyote.jar"/>
4.39 + <pathelement location="${tomcat.home}/lib/tomcat-util.jar"/>
4.40 + </classpath>
4.41 + </taskdef>
4.42 +
4.43 <undeploy url="${tomcat.url}/manager" username="${tomcat.username}"
4.44 password="${tomcat.password}" path="/analytics"/>
4.45 </target>