You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/06/06 16:15:48 UTC

svn commit: r412126 - in /incubator/cayenne/main/branches/PROTO-3.0/modeler: ./ assembly.xml pom.xml src/ src/main/ src/main/assembly/ src/main/assembly/bin.xml

Author: aadamchik
Date: Tue Jun  6 07:15:47 2006
New Revision: 412126

URL: http://svn.apache.org/viewvc?rev=412126&view=rev
Log:
figuring out standalone assembly layout

Added:
    incubator/cayenne/main/branches/PROTO-3.0/modeler/src/
    incubator/cayenne/main/branches/PROTO-3.0/modeler/src/main/
    incubator/cayenne/main/branches/PROTO-3.0/modeler/src/main/assembly/
    incubator/cayenne/main/branches/PROTO-3.0/modeler/src/main/assembly/bin.xml
      - copied, changed from r412068, incubator/cayenne/main/branches/PROTO-3.0/modeler/assembly.xml
Removed:
    incubator/cayenne/main/branches/PROTO-3.0/modeler/assembly.xml
Modified:
    incubator/cayenne/main/branches/PROTO-3.0/modeler/   (props changed)
    incubator/cayenne/main/branches/PROTO-3.0/modeler/pom.xml

Propchange: incubator/cayenne/main/branches/PROTO-3.0/modeler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun  6 07:15:47 2006
@@ -0,0 +1 @@
+target

Modified: incubator/cayenne/main/branches/PROTO-3.0/modeler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/PROTO-3.0/modeler/pom.xml?rev=412126&r1=412125&r2=412126&view=diff
==============================================================================
--- incubator/cayenne/main/branches/PROTO-3.0/modeler/pom.xml (original)
+++ incubator/cayenne/main/branches/PROTO-3.0/modeler/pom.xml Tue Jun  6 07:15:47 2006
@@ -1,18 +1,35 @@
 <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>org.apache.cayenne</groupId>
-	<artifactId>modeler</artifactId>
-	<packaging>pom</packaging>
-	<version>3.0-SNAPSHOT</version>
-	<name>CayenneModeler Assembly</name>
-	<url>http://incubator.apache.org/cayenne/</url>
-
-	<modules>
-		<module>modeler-launcher</module>
-		<module>swing-plugin</module>
-		<module>modeler-plugin</module>
-	</modules>
-	
-	<build>
		<plugins>
			<plugin>
				<artifactId>maven-assembly-plugin</artifactId>
				<configuration>
					<descriptor>assembly.xml</descriptor>
					<finalName>modeler</finalName>
					<outputDirectory>target</outputDirectory>
					<workDirectory>target/assembly/work</workDirectory>
				</configuration>
			</plugin>
		</plugins>
	</build>
+    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>org.apache.cayenne</groupId>
+    <artifactId>modeler</artifactId>
+    <packaging>pom</packaging>
+    <version>3.0-SNAPSHOT</version>
+    <name>CayenneModeler Assembly</name>
+    <url>http://incubator.apache.org/cayenne/</url>
+
+    <modules>
+        <module>modeler-launcher</module>
+        <module>swing-plugin</module>
+        <module>modeler-plugin</module>
+    </modules>
+	
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>modeler-${version}</finalName>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.apache.cayenne.modeler.launcher.Launcher</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Copied: incubator/cayenne/main/branches/PROTO-3.0/modeler/src/main/assembly/bin.xml (from r412068, incubator/cayenne/main/branches/PROTO-3.0/modeler/assembly.xml)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/PROTO-3.0/modeler/src/main/assembly/bin.xml?p2=incubator/cayenne/main/branches/PROTO-3.0/modeler/src/main/assembly/bin.xml&p1=incubator/cayenne/main/branches/PROTO-3.0/modeler/assembly.xml&r1=412068&r2=412126&rev=412126&view=diff
==============================================================================
--- incubator/cayenne/main/branches/PROTO-3.0/modeler/assembly.xml (original)
+++ incubator/cayenne/main/branches/PROTO-3.0/modeler/src/main/assembly/bin.xml Tue Jun  6 07:15:47 2006
@@ -1,5 +1 @@
-<assembly>
	<id>modeler-minimal</id>
	<formats>
		<format>jar</format>
	</formats>
	<includeBaseDirectory>true</includeBaseDirectory>
	<fileSets>
-		<fileSet>
			<directory>modeler-launcher/target/classes</directory>
			<outputDirectory>/</outputDirectory>
		</fileSet>
		<fileSet>
			<directory>swing-plugin/target</directory>
			<outputDirectory>/</outputDirectory>
-			<includes>
            	<include>*.jar</include>
			</includes>
		</fileSet>
-		<fileSet>
			<directory>modeler-plugin/target</directory>
			<outputDirectory>/</outputDirectory>
-			<includes>
            	<include>*.jar</include>
			</includes>
		</fileSet>
	</fileSets>
	<dependencySets>
		<dependencySet>
			<outputDirectory>/</outputDirectory>
			<unpack>true</unpack>
			<scope>runtime</scope>
		</dependencySet>
	</dependencySets>
</assembly>
\ No newline at end of file
+<!-- 
    Assembles a super-jar application that contains a plugin environment 
    launcher and a minimal set of Modeler plugins. To create an assembly,
    run "cd modeler && mvn package assembly:assembly"
-->
<assembly>
    <id>minimal</id>
    <formats>
        <format>jar</format>
    </formats>
    <includeBaseDirectory>false</includeBaseDirectory>
    <fileSets>
        <fileSet>
            <directory>modeler-launcher/target/classes</directory>
            <outputDirectory>/</outputDirectory>
        </fileSet>
    </fileSets>
    <moduleSets>
        <moduleSet>
            <includes>
                <include>org.apache.cayenne:swing-plugin</include>
                <include>org.apache.cayenne:modeler-plugin</include>
            </includes>
            <binaries>
                <outputDirectory>/plugins</outputDirectory>
                <includeDependencies>true</includeDependencies>
                <unpack>false</unpack>
            </binaries> 
        </moduleS
 et>
        <moduleSet>
            <includes>
                <include>org.apache.cayenne:modeler-launcher</include>
            </includes>
            <binaries>
                <outputDirectory>/</outputDirectory>
                <includeDependencies>true</includeDependencies>
                <unpack>true</unpack>
            </binaries> 
        </moduleSet>
    </moduleSets>
</assembly>
\ No newline at end of file