You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/06/26 15:37:40 UTC
svn commit: r788743 - in
/incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin:
.classpath META-INF/MANIFEST.MF build.properties include.xml pom.xml
Author: spoole
Date: Fri Jun 26 15:37:40 2009
New Revision: 788743
URL: http://svn.apache.org/viewvc?rev=788743&view=rev
Log:
updated kato api eclipse project to selectively include api classes from a jar or from a dir - this is a workaround for the m2eclipse + copy-dependencies bug
Added:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/include.xml (with props)
Modified:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/.classpath
incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/META-INF/MANIFEST.MF
incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/build.properties
incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/pom.xml
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/.classpath?rev=788743&r1=788742&r2=788743&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/.classpath (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/.classpath Fri Jun 26 15:37:40 2009
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="lib/kato.api-0.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry exported="true" kind="lib" path="target/api.classes/"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/META-INF/MANIFEST.MF?rev=788743&r1=788742&r2=788743&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/META-INF/MANIFEST.MF (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/META-INF/MANIFEST.MF Fri Jun 26 15:37:40 2009
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.apache.kato.api.plugin;singleton:=true
Bundle-Version: 0.0.1
Bundle-ClassPath: .,
- lib/kato.api-0.0.1-SNAPSHOT.jar
+ target/api.classes/
Bundle-Vendor: Apache Software Foundation
Export-Package: org.apache.kato,
org.apache.kato.image,
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/build.properties
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/build.properties?rev=788743&r1=788742&r2=788743&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/build.properties (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/build.properties Fri Jun 26 15:37:40 2009
@@ -4,4 +4,4 @@
src/test/resources/
bin.includes = META-INF/,\
.,\
- lib/kato.api-0.0.1-SNAPSHOT.jar
+ target/api.classes/
Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/include.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/include.xml?rev=788743&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/include.xml (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/include.xml Fri Jun 26 15:37:40 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ======================================================================
+ 26 Jun 2009 16:19:06
+
+ project
+ description
+
+ spoole
+ ====================================================================== -->
+<project>
+ <target name="include" >
+ <loadfile property="path" srcfile="target/include.txt"/>
+ <available file="${path}" type="dir" property="local.include"/>
+ <antcall target="copy-classes"/>
+ <antcall target="copy-jar"/>
+ </target>
+
+ <target name="copy-classes" if="local.include">
+ <copy todir="target/api.classes">
+ <fileset dir="${path}"/>
+ </copy>
+ </target>
+
+ <target name="copy-jar" unless="local.include">
+ <unjar dest="target/api.classes" overwrite="true" src="${path}"/>
+ </target>
+
+</project>
\ No newline at end of file
Propchange: incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/include.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/pom.xml?rev=788743&r1=788742&r2=788743&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/pom.xml (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato.eclipse/plugins/kato.api.plugin/pom.xml Fri Jun 26 15:37:40 2009
@@ -1,46 +1,67 @@
-<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.eclipse</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.eclipse.plugin</artifactId>
- <packaging>pom</packaging>
- <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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>lib</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
-
+<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.eclipse</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.eclipse.plugin</artifactId>
+ <packaging>pom</packaging>
+ <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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <outputFile>target/include.txt</outputFile>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="include.xml">
+ <target name="include"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
</project>
\ No newline at end of file