[Ogoglio-commits] SF.net SVN: ogoglio: [257] maven/trunk/ogoglio-body-editor-applet

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

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

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

Modified Paths:
--------------
    maven/trunk/ogoglio-body-editor-applet/pom.xml
    maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java

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

Removed Paths:
-------------
    maven/trunk/ogoglio-body-editor-applet/src/assemble/ogoglio-code.xml

Modified: maven/trunk/ogoglio-body-editor-applet/pom.xml
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/pom.xml	2007-08-21 16:23:41 UTC (rev 256)
+++ maven/trunk/ogoglio-body-editor-applet/pom.xml	2007-08-23 00:12:44 UTC (rev 257)
@@ -4,10 +4,11 @@
 	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>ogoglio-body-editor-applet</groupId>
+	<groupId>com.ogoglio</groupId>
 	<artifactId>ogoglio-body-editor-applet</artifactId>
 	<version>0.0.1</version>
-
+	<packaging>jar</packaging>
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -16,11 +17,9 @@
 				<configuration>
 					<descriptors>
 						<descriptor>
-							src/assemble/ogoglio-code.xml
+							src/assemble/common-code.xml
 						</descriptor>
 					</descriptors>
-					<finalName>body-editor</finalName>
-					<appendAssemblyId>false</appendAssemblyId>
 				</configuration>
 				<executions>
 					<execution>

Copied: maven/trunk/ogoglio-body-editor-applet/src/assemble/common-code.xml (from rev 250, maven/trunk/ogoglio-body-editor-applet/src/assemble/ogoglio-code.xml)
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/src/assemble/common-code.xml	                        (rev 0)
+++ maven/trunk/ogoglio-body-editor-applet/src/assemble/common-code.xml	2007-08-23 00:12:44 UTC (rev 257)
@@ -0,0 +1,17 @@
+<assembly>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<id>common</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>

Deleted: maven/trunk/ogoglio-body-editor-applet/src/assemble/ogoglio-code.xml
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/src/assemble/ogoglio-code.xml	2007-08-21 16:23:41 UTC (rev 256)
+++ maven/trunk/ogoglio-body-editor-applet/src/assemble/ogoglio-code.xml	2007-08-23 00:12:44 UTC (rev 257)
@@ -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>

Modified: maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java	2007-08-21 16:23:41 UTC (rev 256)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java	2007-08-23 00:12:44 UTC (rev 257)
@@ -118,22 +118,22 @@
     private class SpacelessContext implements Context {
 
         public InputStream getUserGeometryStream(String username, String name) throws IOException {
-            return BodyEditorApplet.class.getClassLoader().getResourceAsStream("com/ogoglio/viewer/applet/resources/avatar.obj");
+            return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar.obj");
         }
 
         public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
             if (animationID == 1) {
-                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("com/ogoglio/viewer/applet/resources/avatar.bvh");
+                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar.bvh");
             } else if (animationID == 2) {
-                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("com/ogoglio/viewer/applet/resources/avatar-walk.bvh");
+                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar-walk.bvh");
             } else if (animationID == 3) {
-                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("com/ogoglio/viewer/applet/resources/avatar-wave.bvh");
+                return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar-wave.bvh");
             }
             return null;
         }
 
         public InputStream getUserSkinMapStream(String username) throws IOException {
-            return BodyEditorApplet.class.getClassLoader().getResourceAsStream("com/ogoglio/viewer/applet/resources/avatar.smap");
+            return BodyEditorApplet.class.getClassLoader().getResourceAsStream("/avatar/avatar.smap");
         }
 
         public InputStream getPageContentStream(long thingID, long pageID) {


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