[pkg-eucalyptus-commits] r239 - gwt/trunk/debian

Wed Jul 4 12:10:16 UTC 2012

Author: halls
Date: 2012-07-04 12:10:16 +0000 (Wed, 04 Jul 2012)
New Revision: 239

Modified:
   gwt/trunk/debian/changelog
   gwt/trunk/debian/control
   gwt/trunk/debian/libgwt-dev-java.classpath
   gwt/trunk/debian/libgwt-user-java.classpath
Log:
Fix classpaths

* Go through classpaths for jars, looking at dependencies

* Some further items to look at in more detail:

Suggest a servlet server?

guava and google-commons provided the same classes, except guava also had primitives/Primitives.class

Removed jetty, but this might be better as a Suggests (and in the jar's classpath) for unit testing.

Removed geronimo-validation - it's included as a copy under src/javax.
see e.g. class MessageInterpolator
 - looks like debian's libgeronimo-validation-1.0-spec-java

Same for user/src/org/hibernate/validator/engine
 - looks like debian's libhibernate-validator-java

Modified: gwt/trunk/debian/changelog
===================================================================

--- gwt/trunk/debian/changelog	2012-07-04 12:10:12 UTC (rev 238)
+++ gwt/trunk/debian/changelog	2012-07-04 12:10:16 UTC (rev 239)
@@ -12,6 +12,8 @@
   * patches/fix-test-classpath: New patch to use the same classpath for running
     tests as used during the build
   * Use javahelper to set a classpath and dependencies
+  * Add build against libxerces2-java and to classpath, as this is the same
+    as upstream uses
   * Set maintainer to Eucalyptus packaging team with Brian & myself
     as uploaders
   * Standards version 3.9.3 (no changes required)

Modified: gwt/trunk/debian/control
===================================================================
--- gwt/trunk/debian/control	2012-07-04 12:10:12 UTC (rev 238)
+++ gwt/trunk/debian/control	2012-07-04 12:10:16 UTC (rev 239)
@@ -8,7 +8,6 @@
  libcommons-collections3-java,
  libservlet2.5-java,
  libjetty-java,
- libjetty-extra-java,
  libecj-java,
  libswt-gtk-3-java,
  libswt-gtk-3-java-gcj,
@@ -17,7 +16,6 @@
  libguava-java,
  libhtmlunit-java,
  libhtmlunit-core-js-java,
- libjetty-java,
  libprotobuf-java,
  protobuf-compiler,
  libcommons-logging-java,
@@ -27,7 +25,8 @@
  libflute-java,
  libhibernate-validator-java,
  libhibernate3-java,
- libjsilver-java
+ libjsilver-java,
+ libxerces2-java
 Build-Depends: ant, ant-contrib, debhelper (>= 5), cdbs (>= 0.4.5.3), javahelper
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/pkg-eucalyptus/gwt/trunk

Modified: gwt/trunk/debian/libgwt-dev-java.classpath
===================================================================
--- gwt/trunk/debian/libgwt-dev-java.classpath	2012-07-04 12:10:12 UTC (rev 238)
+++ gwt/trunk/debian/libgwt-dev-java.classpath	2012-07-04 12:10:16 UTC (rev 239)
@@ -1 +1 @@
-usr/share/java/gwt-dev-2.4.0.jar /usr/share/java/ant.jar /usr/share/java/commons-collections3.jar /usr/share/java/eclipse-ecj.jar /usr/share/java/glassfish-javaee.jar /usr/share/java/google-collections-1.0.jar /usr/share/java/guava.jar /usr/share/java/htmlunit-core-js.jar /usr/share/java/htmlunit.jar /usr/share/java/jetty.jar /usr/share/java/jetty-util.jar /usr/share/java/protobuf.jar
+usr/share/java/gwt-dev-2.4.0.jar /usr/share/java/ant.jar /usr/share/java/commons-collections3.jar /usr/share/java/eclipse-ecj.jar /usr/share/java/glassfish-javaee.jar /usr/share/java/guava.jar /usr/share/java/htmlunit-core-js.jar /usr/share/java/htmlunit.jar /usr/share/java/jetty.jar /usr/share/java/jetty-util.jar /usr/share/java/protobuf.jar /usr/share/java/google-collections-1.0.jar

Modified: gwt/trunk/debian/libgwt-user-java.classpath
===================================================================
--- gwt/trunk/debian/libgwt-user-java.classpath	2012-07-04 12:10:12 UTC (rev 238)
+++ gwt/trunk/debian/libgwt-user-java.classpath	2012-07-04 12:10:16 UTC (rev 239)
@@ -1,2 +1,2 @@
-usr/share/java/gwt-servlet-2.4.0.jar /usr/share/java/flute-1.1-SNAPSHOT.jar /usr/share/java/glassfish-javaee-2.1.1-b31g.jar /usr/share/java/google-collections-1.0.jar /usr/share/java/guava-11.0.2.jar /usr/share/java/jsilver-1.0.0.jar /usr/share/java/json_simple-1.1.jar /usr/share/java/libgcj-4.7.jar /usr/share/java/sac-1.3.jar /usr/share/java/servlet-api-2.5.jar /usr/share/java/xml-apis-1.3.04.jar /usr/share/java/xml-apis-1.4.01.jar /usr/share/java/xml-apis-ext-1.4.01.jar /usr/share/maven-repo/javax/xml/jaxp-api/1.3/jaxp-api-1.3.jar /usr/share/maven-repo/org/apache/geronimo/specs/geronimo-validation_1.0_spec/1.1/geronimo-validation_1.0_spec-1.1.jar /usr/share/maven-repo/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA.jar
-usr/share/java/gwt-user-2.4.0.jar /usr/share/java/com.ibm.icu-4.2.1.1.jar /usr/share/java/com.ibm.icu-4.4.jar /usr/share/java/com.ibm.icu.base-4.2.1.1.jar /usr/share/java/com.ibm.icu.base-4.4.jar /usr/share/java/flute-1.1-SNAPSHOT.jar /usr/share/java/glassfish-javaee-2.1.1-b31g.jar /usr/share/java/google-collections-1.0.jar /usr/share/java/guava-11.0.2.jar /usr/share/java/jetty-6.1.24.jar /usr/share/java/jsilver-1.0.0.jar /usr/share/java/json_simple-1.1.jar /usr/share/java/junit-3.8.2.jar /usr/share/java/junit4-4.10.jar /usr/share/java/libgcj-4.7.jar /usr/share/java/sac-1.3.jar /usr/share/java/servlet-api-2.5.jar /usr/share/java/xml-apis-1.3.04.jar /usr/share/java/xml-apis-1.4.01.jar /usr/share/java/xml-apis-ext-1.4.01.jar /usr/share/maven-repo/javax/xml/jaxp-api/1.3/jaxp-api-1.3.jar /usr/share/maven-repo/net/sourceforge/htmlunit/htmlunit/2.8/htmlunit-2.8.jar /usr/share/maven-repo/org/apache/geronimo/specs/geronimo-validation_1.0_spec/1.1/geronimo-validation_1.0_spec-1.1.jar /usr/share/maven-repo/org/hibernate/hibernate-validator/4.0.2.GA/hibernate-validator-4.0.2.GA.jar
+usr/share/java/gwt-user-2.4.0.jar /usr/share/java/icu4j.jar /usr/share/java/flute.jar /usr/share/java/guava.jar /usr/share/java/jetty.jar /usr/share/java/jsilver.jar /usr/share/java/json_simple.jar /usr/share/java/junit4.jar /usr/share/java/sac.jar /usr/share/java/xmlParserAPIs.jar /usr/share/java/htmlunit.jar
+usr/share/java/gwt-servlet-2.4.0.jar /usr/share/java/flute.jar /usr/share/java/guava.jar /usr/share/java/jsilver.jar /usr/share/java/json_simple.jar /usr/share/java/sac.jar /usr/share/java/xmlParserAPIs.jar


