incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r778310 - in /incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin: ./ .classpath META-INF/MANIFEST.MF build.properties pom.xml
Date Mon, 25 May 2009 07:03:27 GMT
Author: spoole
Date: Mon May 25 07:03:26 2009
New Revision: 778310

URL: http://svn.apache.org/viewvc?rev=778310&view=rev
Log:
more adjusting of maven eclipse plugin projects

Modified:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/
  (props changed)
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/META-INF/MANIFEST.MF
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.properties
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/pom.xml

Propchange: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 25 07:03:26 2009
@@ -1 +1,4 @@
 target
+javaCompiler...args
+kato.api.plugin_1.0.0.zip
+build.xml

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath?rev=778310&r1=778309&r2=778310&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
Mon May 25 07:03:26 2009
@@ -7,5 +7,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="lib" path="target/lib/kato.api.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/META-INF/MANIFEST.MF?rev=778310&r1=778309&r2=778310&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/META-INF/MANIFEST.MF
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/META-INF/MANIFEST.MF
Mon May 25 07:03:26 2009
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: kato.api.plugin;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: .,
- target/kato.api.plugin-0.0.1-SNAPSHOT.jar
+ target/lib/kato.api.jar
 Bundle-Vendor: Apache Software Foundation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Activator: org.apache.kato.api.plugin.Activator

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.properties
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.properties?rev=778310&r1=778309&r2=778310&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.properties
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/build.properties
Mon May 25 07:03:26 2009
@@ -1,14 +1,10 @@
-source.. = src/,\
-           src/main/java/,\
-           src/main/resources/,\
-           src/test/java/,\
-           src/test/resources/
+source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               target/classes/
-
-javacSource=1.6
+               icons/,\
+               target/lib/kato.api.jar
+               
 javacTarget=1.6
-
+javacSource=1.6

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/pom.xml?rev=778310&r1=778309&r2=778310&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/pom.xml
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/pom.xml
Mon May 25 07:03:26 2009
@@ -1,64 +1,74 @@
-<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">
-	<parent>
-		<artifactId>kato</artifactId>
-		<groupId>org.apache.kato</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.kato</groupId>
-	<artifactId>kato.api.plugin</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.kato</groupId>
-			<artifactId>kato.api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-		<plugin>
+<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">
+  <parent>
+    <artifactId>kato</artifactId>
+    <groupId>org.apache.kato</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.kato</groupId>
+  <artifactId>kato.api.plugin</artifactId>
+  <packaging>zip</packaging>
+  <version>0.0.1-SNAPSHOT</version>
+  <build>
+  	<plugins>
+  	
+  	<plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>unpack-dependencies</id>
-            <phase>prepare-package</phase>
+            <id>copy</id>
+            <phase>generate-resources</phase>
             <goals>
-              <goal>unpack-dependencies</goal>
+              <goal>copy</goal>
             </goals>
             <configuration>
-              <includes>**/*.class</includes>
-              <excludes>**/*.properties</excludes>
-              <outputDirectory>${project.build.directory}/classes</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.kato</groupId>
+                  <artifactId>kato.api</artifactId>
+                  <version>0.0.1-SNAPSHOT</version>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                  <destFileName>kato.api.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/wars</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
             </configuration>
           </execution>
         </executions>
       </plugin>
-		
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>pde-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<eclipseInstall>/home/spoole/eclipseinstall/eclipse</eclipseInstall>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
+  	
+  	
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>pde-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <eclipseInstall>/home/spoole/eclipseinstall/eclipse</eclipseInstall>
+        </configuration>
+      </plugin>
+    	<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
 				</configuration>
-			</plugin>
-
-
-
-		</plugins>
-	</build>
-
+		</plugin>
+	</plugins>
+    
+  	
+  </build>
+  <dependencies>
+  	<dependency>
+  		<groupId>org.apache.kato</groupId>
+  		<artifactId>kato.api</artifactId>
+  		<version>0.0.1-SNAPSHOT</version>
+  		<type>jar</type>
+  	</dependency>
+  </dependencies>
 </project>



Mime
View raw message