[P2play-commit] SF.net SVN: p2play: [45] trunk/P2PlayAdmin
Status: Pre-Alpha
Brought to you by:
tisoft
Menu
▾
▴
[P2play-commit] SF.net SVN: p2play: [45] trunk/P2PlayAdmin
|
From: <ti...@us...> - 2007-03-20 12:25:28
|
Revision: 45
http://p2play.svn.sourceforge.net/p2play/?rev=45&view=rev
Author: tisoft
Date: 2007-03-20 05:08:01 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
changes for maven
Modified Paths:
--------------
trunk/P2PlayAdmin/.classpath
trunk/P2PlayAdmin/.project
trunk/P2PlayAdmin/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.component
trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.project.facet.core.xml
Added Paths:
-----------
trunk/P2PlayAdmin/pom.xml
Modified: trunk/P2PlayAdmin/.classpath
===================================================================
--- trunk/P2PlayAdmin/.classpath 2007-03-20 12:07:00 UTC (rev 44)
+++ trunk/P2PlayAdmin/.classpath 2007-03-20 12:08:01 UTC (rev 45)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0 (MacOS X Default)"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="var" path="GWT_HOME/gwt-user.jar"/>
- <classpathentry kind="output" path="build/classes"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/P2PlayAdmin/.project
===================================================================
--- trunk/P2PlayAdmin/.project 2007-03-20 12:07:00 UTC (rev 44)
+++ trunk/P2PlayAdmin/.project 2007-03-20 12:08:01 UTC (rev 45)
@@ -3,7 +3,6 @@
<name>P2PlayAdmin</name>
<comment></comment>
<projects>
- <project>P2Play</project>
<project>P2PlayBoot</project>
<project>Servers</project>
</projects>
@@ -14,6 +13,11 @@
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -33,14 +37,8 @@
<nature>com.googlipse.gwt.gwtNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</natures>
- <linkedResources>
- <link>
- <name>WebContent/WEB-INF/lib/gwt-servlet.jar</name>
- <type>1</type>
- <locationURI>GWT_HOME/gwt-servlet.jar</locationURI>
- </link>
- </linkedResources>
</projectDescription>
Modified: trunk/P2PlayAdmin/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/P2PlayAdmin/.settings/org.eclipse.jst.common.project.facet.core.prefs 2007-03-20 12:07:00 UTC (rev 44)
+++ trunk/P2PlayAdmin/.settings/org.eclipse.jst.common.project.facet.core.prefs 2007-03-20 12:08:01 UTC (rev 45)
@@ -1,4 +1,4 @@
-#Tue Jan 16 22:00:18 CET 2007
+#Tue Mar 20 08:43:01 CET 2007
classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.5.0\ (MacOS\ X\ Default)/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:_sw_var_tomcat5/owners=jst.web\:2.4
eclipse.preferences.version=1
Modified: trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.component 2007-03-20 12:07:00 UTC (rev 44)
+++ trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.component 2007-03-20 12:08:01 UTC (rev 45)
@@ -1,40 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="P2PlayAdmin">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/" source-path="/build/gwtOutput"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/P2Play/P2Play">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2Play/lib/pnuts.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2Play/lib/jdom.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2Play/lib/javolution.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/P2PlayBoot/P2PlayBoot">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2PlayBoot/lib/commons-vfs-20070107.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2PlayBoot/lib/commons-logging-1.1.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2PlayBoot/lib/xstream-1.1.3.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2PlayBoot/lib/xpp3-1.1.3.4d_b2.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/P2PlayBoot/lib/FreePastry.jar">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<property name="context-root" value="P2PlayAdmin"/>
-<property name="java-output-path" value="build/classes"/>
+<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+<property name="context-root" value="/P2PlayAdmin"/>
</wb-module>
</project-modules>
Modified: trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.project.facet.core.xml 2007-03-20 12:07:00 UTC (rev 44)
+++ trunk/P2PlayAdmin/.settings/org.eclipse.wst.common.project.facet.core.xml 2007-03-20 12:08:01 UTC (rev 45)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="Apache Tomcat v5.5"/>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.web" version="2.4"/>
Added: trunk/P2PlayAdmin/pom.xml
===================================================================
--- trunk/P2PlayAdmin/pom.xml (rev 0)
+++ trunk/P2PlayAdmin/pom.xml 2007-03-20 12:08:01 UTC (rev 45)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>P2PlayAdmin</groupId>
+ <artifactId>P2PlayAdmin</artifactId>
+ <packaging>war</packaging>
+ <version>0.0.1</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.totsp.gwt</groupId>
+ <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+ <version>1.5.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>mergewebxml</goal>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <logLevel>ALL</logLevel>
+ <runTarget>
+ org.p2play.web.vfs.VFS/VFS.html
+ </runTarget>
+ <compileTarget>
+ org.p2play.web.vfs.VFS
+ </compileTarget>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>gwt-maven</id>
+ <url>
+ http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
+ </url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>1.3.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>P2Play</groupId>
+ <artifactId>P2PlayService</artifactId>
+ <version>0.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
