[Ogoglio-commits] SF.net SVN: ogoglio: [261] maven/trunk/ogoglio-viewer-applet

[<ian...@us...>]

Revision: 261
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=261&view=rev
Author:   iansmith
Date:     2007-08-22 17:14:53 -0700 (Wed, 22 Aug 2007)

Log Message:
-----------
safety checkin

Modified Paths:
--------------
    maven/trunk/ogoglio-viewer-applet/pom.xml

Added Paths:
-----------
    maven/trunk/ogoglio-viewer-applet/src/assemble/common-code.xml

Removed Paths:
-------------
    maven/trunk/ogoglio-viewer-applet/src/assemble/ogoglio-code.xml
    maven/trunk/ogoglio-viewer-applet/src/main/resources/art3d/

Modified: maven/trunk/ogoglio-viewer-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-viewer-applet/pom.xml	2007-08-23 00:14:27 UTC (rev 260)
+++ maven/trunk/ogoglio-viewer-applet/pom.xml	2007-08-23 00:14:53 UTC (rev 261)
@@ -1,11 +1,14 @@
-<?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>com.ogoglio</groupId>
-  <artifactId>ogoglio-viewer-applet</artifactId>
-  <version>0.0.1</version>
-  
-  	<build>
+<?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>com.ogoglio</groupId>
+	<artifactId>ogoglio-viewer-applet</artifactId>
+	<version>0.0.1</version>
+	<packaging>jar</packaging>
+
+	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -13,18 +16,17 @@
 				<configuration>
 					<descriptors>
 						<descriptor>
-							src/assemble/ogoglio-code.xml
+							src/assemble/common-code.xml
 						</descriptor>
 					</descriptors>
-					<finalName>viewer</finalName>
-					<appendAssemblyId>false</appendAssemblyId>
+					<appendAssemblyId>true</appendAssemblyId>
 				</configuration>
 				<executions>
 					<execution>
 						<id>make-assembly</id>
 						<phase>package</phase><!-- append to the packaging phase. -->
 						<goals>
-							<goal>attached</goal><!--tricky, this "attaches" this to a goal -->
+							<goal>attached</goal><!--tricky, this "attaches" this to normal assembly -->
 						</goals>
 					</execution>
 				</executions>
@@ -32,29 +34,29 @@
 			</plugin>
 		</plugins>
 	</build>
-  
-  
-  <dependencies>
-    <dependency>
-      <groupId>netscape</groupId>
-      <artifactId>liveConnect</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.ogoglio</groupId>
-      <artifactId>ogoglio-common</artifactId>
-      <version>0.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>java3d</groupId>
-      <artifactId>vecmath</artifactId>
-      <version>1.3.1</version>
-    </dependency>
-  </dependencies>
-</project>
-
+
+
+	<dependencies>
+		<dependency>
+			<groupId>netscape</groupId>
+			<artifactId>liveConnect</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.ogoglio</groupId>
+			<artifactId>ogoglio-common</artifactId>
+			<version>0.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>java3d</groupId>
+			<artifactId>vecmath</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+	</dependencies>
+</project>
+

Copied: maven/trunk/ogoglio-viewer-applet/src/assemble/common-code.xml (from rev 250, maven/trunk/ogoglio-viewer-applet/src/assemble/ogoglio-code.xml)
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/assemble/common-code.xml	                        (rev 0)
+++ maven/trunk/ogoglio-viewer-applet/src/assemble/common-code.xml	2007-08-23 00:14:53 UTC (rev 261)
@@ -0,0 +1,17 @@
+<assembly>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<id>common</id>
+	<formats>
+		<format>jar</format>
+	</formats>
+
+	<dependencySets>
+		<dependencySet>
+			<unpack>true</unpack>
+			<outputFileNameMapping></outputFileNameMapping>
+			<includes>
+				<include>com.ogoglio:ogoglio-common</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
+</assembly>

Deleted: maven/trunk/ogoglio-viewer-applet/src/assemble/ogoglio-code.xml
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/assemble/ogoglio-code.xml	2007-08-23 00:14:27 UTC (rev 260)
+++ maven/trunk/ogoglio-viewer-applet/src/assemble/ogoglio-code.xml	2007-08-23 00:14:53 UTC (rev 261)
@@ -1,17 +0,0 @@
-<assembly>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<id>ogoglio-code</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<dependencySets>
-		<dependencySet>
-			<unpack>true</unpack>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<outputFileNameMapping></outputFileNameMapping>
-			<includes>
-				<include>com.ogoglio:ogoglio-common</include>
-			</includes>
-		</dependencySet>
-	</dependencySets>
-</assembly>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.