cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r412085 - in /incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin: ./ src/main/java/ src/main/resources/
Date Tue, 06 Jun 2006 11:15:25 GMT
Author: aadamchik
Date: Tue Jun  6 04:15:24 2006
New Revision: 412085

URL: http://svn.apache.org/viewvc?rev=412085&view=rev
Log:
another reorg 

Added:
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/assembly.xml
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/resources/
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/resources/actions.xml
      - copied unchanged from r412068, incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/actions.xml
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/resources/plugin.properties
      - copied unchanged from r412068, incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/plugin.properties
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/resources/plugin.xml
      - copied unchanged from r412068, incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/plugin.xml
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/resources/plugin_ru.properties
      - copied unchanged from r412068, incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/plugin_ru.properties
Removed:
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/actions.xml
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/plugin.properties
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/plugin.xml
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/src/main/java/plugin_ru.properties
Modified:
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/.classpath
    incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/pom.xml

Modified: incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/.classpath?rev=412085&r1=412084&r2=412085&view=diff
==============================================================================
--- incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/.classpath (original)
+++ incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/.classpath Tue Jun  6 04:15:24
2006
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" 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"/>

Added: incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/assembly.xml?rev=412085&view=auto
==============================================================================
--- incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/assembly.xml (added)
+++ incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/assembly.xml Tue Jun  6
04:15:24 2006
@@ -0,0 +1,23 @@
+<assembly>
+  <id>deps</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      
+      <!-- this line puts all dependencies as jars in the assembly jar - exactly what
we need -->
+      <unpack>false</unpack>
+      
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file

Modified: incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/pom.xml?rev=412085&r1=412084&r2=412085&view=diff
==============================================================================
--- incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/pom.xml (original)
+++ incubator/cayenne/main/branches/PROTO-3.0/modeler/swing-plugin/pom.xml Tue Jun  6 04:15:24
2006
@@ -7,7 +7,29 @@
   <version>3.0-SNAPSHOT</version>
   <name>Generic Swing Plugin</name>
   <url>http://maven.apache.org</url>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptor>assembly.xml</descriptor>
+					<finalName>swing-plugin-${version}</finalName>
+					<outputDirectory>target</outputDirectory>
+					<workDirectory>target/assembly/work</workDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	
 	<dependencies>
+		
+		<dependency>
+			<groupId>org.objectstyle.cayenne</groupId>
+			<artifactId>cayenne-modeler</artifactId>
+			<version>1.2-SNAPSHOT</version>
+		</dependency>
     
 		<!-- provided dependencies -->
 		<dependency>
@@ -16,12 +38,7 @@
 			<version>1.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.objectstyle.cayenne</groupId>
-			<artifactId>cayenne-modeler</artifactId>
-			<version>1.2-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
+		
   </dependencies>
   
   <repositories>



Mime
View raw message