r1147 - in trunk: . src/main/java/org/xwiki src/main/java/org/xwiki/gwt war/WEB-INF/lib - kune-commits

15 Apr 2010

Author: vjrj
Date: 2010-04-15 17:53:09 +0200 (Thu, 15 Apr 2010)
New Revision: 1147

Removed:
   trunk/war/WEB-INF/lib/gwt-servlet.jar
Modified:
   trunk/
   trunk/pom.xml
   trunk/src/main/java/org/xwiki/
   trunk/src/main/java/org/xwiki/gwt/
   trunk/war/WEB-INF/lib/
Log:
xwiki dep updated


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - pmd-eclipse.log
.pmd
www-test
screenlog.0
bin
client
public
target
Main-compile
bin
.settings
.gwt-cache
repository
derby.log
star-yellow-grey.png
run.sh
tomcat
.classpath
gwt-out
synccss.sh
.externalToolBuilders
.project
.wtpmodules
www
testRepository
kune-OLD-jcr
KuneApp.launch
KuneApp NOSERVER.launch
old_src
org.ourproject.kune.app.Kune
org.ourproject.kune.iml
org.ourproject.kune.ipr
org.ourproject.kune.iws
nbproject
hibernate.reveng.xml
.gwt-tmp
target-eclipse
.checkstyle

   + pmd-eclipse.log
.pmd
www-test
screenlog.0
bin
client
public
target
Main-compile
bin
.settings
.gwt-cache
repository
derby.log
star-yellow-grey.png
run.sh
tomcat
.classpath
gwt-out
synccss.sh
.externalToolBuilders
.project
.wtpmodules
www
testRepository
kune-OLD-jcr
KuneApp.launch
KuneApp NOSERVER.launch
old_src
org.ourproject.kune.app.Kune
org.ourproject.kune.iml
org.ourproject.kune.ipr
org.ourproject.kune.iws
nbproject
hibernate.reveng.xml
.gwt-tmp
target-eclipse
.checkstyle

.classpath-bien


Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2010-03-30 00:17:04 UTC (rev 1146)
+++ trunk/pom.xml	2010-04-15 15:53:09 UTC (rev 1147)
@@ -48,7 +48,7 @@
       <artifactId>gwt-user</artifactId>
       <version>${gwt.version}</version>
       <scope>provided</scope>
-      </dependency>
+    </dependency>
     <!--
       <dependency> <groupId>com.extjs</groupId>
       <artifactId>gxt</artifactId> <version>1.0-beta2</version>
@@ -101,14 +101,14 @@
       <artifactId>jmagick</artifactId>
       <version>6.2.6-0</version>
     </dependency>
-    <!--
-      <dependency> <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-web-gwt-dom</artifactId> <version>2.2</version>
-    -->
-    <!-- <version>2.0-SNAPSHOT-g164</version> -->
-    <!-- <version>2.0-SNAPSHOT</version>  -->
-    <!-- <version>2.0-SNAPSHOT-g20s</version> -->
-    <!--    </dependency> -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-web-gwt-dom</artifactId>
+      <version>2.3-rc-1</version>
+      <!-- <version>2.0-SNAPSHOT-g164</version> -->
+      <!-- <version>2.0-SNAPSHOT</version>  -->
+      <!-- <version>2.0-SNAPSHOT-g20s</version> -->
+    </dependency>
 
     <!-- xmpp -->
     <dependency>
@@ -263,23 +263,23 @@
       <version>1.7.0.0</version>
     </dependency>
 
-<!--     jetty dependencies -->
-        <dependency>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-          <version>6.1.11</version>
-<!--          <version>7.0.0.pre5</version>-->
-          <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>maven-jetty-plugin</artifactId>
-<!--            <artifactId>jetty-maven-plugin</artifactId>-->
-<!--            <version>7.0.0.1beta0</version>-->
-          <version>6.1.11</version>
-          <scope>runtime</scope>
-        </dependency>
+    <!--     jetty dependencies -->
     <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.11</version>
+      <!--          <version>7.0.0.pre5</version>-->
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>maven-jetty-plugin</artifactId>
+      <!--            <artifactId>jetty-maven-plugin</artifactId>-->
+      <!--            <version>7.0.0.1beta0</version>-->
+      <version>6.1.11</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
@@ -307,12 +307,12 @@
         <scope>test</scope>
       -->
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>org.openqa.selenium.client-drivers</groupId>-->
-<!--      <artifactId>selenium-java-client-driver</artifactId>-->
-<!--      <version>1.0-beta-1</version>-->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
+    <!--    <dependency>-->
+    <!--      <groupId>org.openqa.selenium.client-drivers</groupId>-->
+    <!--      <artifactId>selenium-java-client-driver</artifactId>-->
+    <!--      <version>1.0-beta-1</version>-->
+    <!--      <scope>test</scope>-->
+    <!--    </dependency>-->
 
     <!-- public side -->
     <dependency>
@@ -495,6 +495,17 @@
       </releases>
     </repository>
     <repository>
+      <id>xwiki-releases</id>
+      <name>XWiki Maven2 Remote Repository for Releases</name>
+      <url>http://maven.xwiki.org/releases</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
       <id>xwiki</id>
       <name>XWiki Repository</name>
       <url>http://maven.xwiki.org/snapshots</url>
@@ -591,15 +602,17 @@
       </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-<!--        <artifactId>jetty-maven-plugin</artifactId>-->
-<!--        <version>7.0.0.1beta0</version>-->
+        <!--        <artifactId>jetty-maven-plugin</artifactId>-->
+        <!--        <version>7.0.0.1beta0</version>-->
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.11</version> <configuration>
-        <contextPath>/</contextPath>
-        <webAppSourceDirectory>war</webAppSourceDirectory>
-        <reload>manual</reload>
-        <scanIntervalSeconds>0</scanIntervalSeconds> </configuration>
-        </plugin>
+        <version>6.1.11</version>
+        <configuration>
+          <contextPath>/</contextPath>
+          <webAppSourceDirectory>war</webAppSourceDirectory>
+          <reload>manual</reload>
+          <scanIntervalSeconds>0</scanIntervalSeconds>
+        </configuration>
+      </plugin>
       <!--
         <plugin> <groupId>org.codehaus.mojo</groupId>
         <artifactId>deb-maven-plugin</artifactId>
@@ -696,24 +709,24 @@
           </execution>
         </executions>
       </plugin>
-<!--      <plugin>-->
-<!--        <groupId>org.codehaus.mojo</groupId>-->
-<!--        <artifactId>selenium-maven-plugin</artifactId>-->
-<!--        <configuration>-->
-<!--          <port>4441</port>-->
-<!--        </configuration>-->
-<!--        <executions>-->
-<!--          <execution>-->
-<!--            <phase>pre-integration-test</phase>-->
-<!--            <goals>-->
-<!--              <goal>start-server</goal>-->
-<!--            </goals>-->
-<!--            <configuration>-->
-<!--              <background>true</background>-->
-<!--            </configuration>-->
-<!--          </execution>-->
-<!--        </executions>-->
-<!--      </plugin>-->
+      <!--      <plugin>-->
+      <!--        <groupId>org.codehaus.mojo</groupId>-->
+      <!--        <artifactId>selenium-maven-plugin</artifactId>-->
+      <!--        <configuration>-->
+      <!--          <port>4441</port>-->
+      <!--        </configuration>-->
+      <!--        <executions>-->
+      <!--          <execution>-->
+      <!--            <phase>pre-integration-test</phase>-->
+      <!--            <goals>-->
+      <!--              <goal>start-server</goal>-->
+      <!--            </goals>-->
+      <!--            <configuration>-->
+      <!--              <background>true</background>-->
+      <!--            </configuration>-->
+      <!--          </execution>-->
+      <!--        </executions>-->
+      <!--      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -809,4 +822,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
+</project>
\ No newline at end of file


Property changes on: trunk/src/main/java/org/xwiki
___________________________________________________________________
Name: svn:externals
   - gwt http://svn.xwiki.org/svnroot/xwiki/platform/web/trunk/xwiki-gwt-dom/src/main...

   + 



Property changes on: trunk/src/main/java/org/xwiki/gwt
___________________________________________________________________
Name: svn:externals
   - dom http://svn.xwiki.org/svnroot/xwiki/platform/web/trunk/xwiki-gwt-dom/src/main...

   + 



Property changes on: trunk/war/WEB-INF/lib
___________________________________________________________________
Name: svn:ignore
   + ant-1.6.5.jar

antlr-2.7.6.jar

aopalliance-1.0.jar

asm-1.5.3.jar

asm-attrs-1.5.3.jar

avalon-framework-4.1.3.jar

bsh-2.0b4.jar

c3p0-0.9.1.2.jar

cglib-2.1_3.jar

classworlds-1.1-alpha-2.jar

collect-1.0-rc2.jar

commons-beanutils-1.7.0.jar

commons-cli-1.2.jar

commons-codec-1.3.jar

commons-collections-3.2.jar

commons-fileupload-1.1.1.jar

commons-io-1.2.jar

commons-lang-2.0.jar

commons-logging-1.1.jar

core-3.1.1.jar

dom4j-1.6.1.jar

dozer-4.0.jar

ehcache-1.2.3.jar

ejb3-persistence-1.0.2.GA.jar

emite-0.4.7.jar

ezmorph-1.0.3.jar

freemarker-2.3.8.jar

geronimo-annotation_1.0_spec-1.0.jar

geronimo-spec-jta-1.0.1B-rc4.jar

guice-2.0.1.jar

guice-assistedinject-2.0.jar

guice-servlet-2.0.1.jar

gwt-1.2.2.jar

gwt-log-2.6.2.jar

gwt-log-3.0.1.jar

gwt-servlet-2.0.0.jar

gwt-user-2.0.0.jar

gwt-voices-1.6.0.jar

gwtext-2.0.5.jar

gwtextux-0.4.0.924.jar

h2-1.0.20070617.jar

hibernate-3.2.1.ga.jar

hibernate-annotations-3.4.0.GA.jar

hibernate-commons-annotations-3.3.0.ga.jar

hibernate-core-3.3.1.GA.jar

hibernate-entitymanager-3.4.0.GA.jar

hibernate-search-3.1.0.GA.jar

hibernate-tools-3.2.3.GA.jar

hibernate-validator-3.1.0.GA.jar

javassist-3.4.GA.jar

jettison-1.0-RC2.jar

jetty-6.1.11.jar

jetty-annotations-6.1.11.jar

jetty-management-6.1.11.jar

jetty-naming-6.1.11.jar

jetty-plus-6.1.11.jar

jetty-util-6.1.11.jar

jline-0.9.94.jar

jmagick-6.2.6-0.jar

jruby-complete-1.2.0.jar

jruby-rack-0.9.4.jar

json-lib-2.1-jdk15.jar

jsp-2.1-6.1.11.jar

jsp-api-2.1-6.1.11.jar

jta-1.1.jar

jtidy-r8-20060801.jar

junit-4.4.jar

kune-wave-server-0.0.2.2.jar

libidn-1.15.jar

liquibase-core-1.7.0.jar

liquibase-plugin-1.7.0.0.jar

log4j-1.2.14.jar

logkit-1.0.1.jar

lucene-core-2.4.0.jar

mail-1.4.jar

maven-artifact-2.0.3.jar

maven-artifact-2.0.jar

maven-artifact-manager-2.0.jar

maven-jetty-plugin-6.1.11.jar

maven-model-2.0.jar

maven-plugin-api-2.0.jar

maven-plugin-descriptor-2.0.jar

maven-plugin-tools-api-2.0.jar

maven-profile-2.0.jar

maven-project-2.0.jar

maven-repository-metadata-2.0.jar

mockito-all-1.6.jar

mysql-connector-java-5.0.5.jar

org.mortbay.jetty-5.1.10.jar

persistence-api-1.0.jar

plexus-container-default-1.0-alpha-8.jar

plexus-utils-1.0.4.jar

protobuf-java-2.1.0.jar

selenium-core-1.0-beta-1.jar

selenium-java-client-driver-1.0-beta-1.jar

selenium-server-1.0-beta-1-standalone.jar

selenium-server-coreless-0.9.1.jar

servlet-api-2.4.jar

servlet-api-2.5-6.1.11.jar

slf4j-api-1.5.2.jar

slf4j-log4j12-1.5.2.jar

smack-3.0.4.jar

smackx-3.0.4.jar

smackx-debugger-3.0.4.jar

start-6.1.11.jar

stax-api-1.0.1.jar

suco-0.6.1.jar

suco-0.6.5.jar

wagon-provider-api-1.0-alpha-5.jar

warp-persist-2.0-SNAPSHOT.jar

whack-1.0.0.jar

xml-apis-1.0.b2.jar

xmpp-1.0.0.jar

xpp3-1.1.4c.jar

xpp3_min-1.1.3.4.O.jar

xpp3_xpath-1.1.4c.jar

xstream-1.2.2.jar


Deleted: trunk/war/WEB-INF/lib/gwt-servlet.jar
===================================================================
(Binary files differ)

    

r1147 - in trunk: . src/main/java/org/xwiki src/main/java/org/xwiki/gwt war/WEB-INF/lib

vjrj

tags

participants (1)