[Jboss-svn-commits] JBL Code SVN: r1876 - in trunk/forge/portal-extensions/shotoku: . shotoku-base/src/java/org/jboss/shotoku

[<jbo...@li...>]

Author: adamw
Date: 2005-12-19 15:39:27 -0500 (Mon, 19 Dec 2005)
New Revision: 1876

Modified:
   trunk/forge/portal-extensions/shotoku/
   trunk/forge/portal-extensions/shotoku/maven.xml
   trunk/forge/portal-extensions/shotoku/project.properties
   trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
Log:
http://jira.jboss.com/jira/browse/JBSHOTOKU-44 : done



Property changes on: trunk/forge/portal-extensions/shotoku
___________________________________________________________________
Name: svn:ignore
   - build.properties

   + build.properties
target


Modified: trunk/forge/portal-extensions/shotoku/maven.xml
===================================================================
--- trunk/forge/portal-extensions/shotoku/maven.xml	2005-12-19 20:12:34 UTC (rev 1875)
+++ trunk/forge/portal-extensions/shotoku/maven.xml	2005-12-19 20:39:27 UTC (rev 1876)
@@ -64,14 +64,48 @@
 		<j:set var="goal" value="deploy" />
                 <attainGoal name="shotoku-all-projects" />
 	</goal>
-
 	
 	<goal name="clean">
 		<attainGoal name="prj-clean" />
+		<ant:delete dir="target" />
 		<ant:delete dir="shotoku-base/target" />
 		<ant:delete dir="shotoku-aop/target" />
 		<ant:delete dir="shotoku-svn/target" />
 		<ant:delete dir="shotoku-test/target" />
 		<ant:delete dir="${local.deploy.dir}/00shotoku.ear" />
 	</goal>
+
+	<goal name="jar-to-dir">
+		<ant:unjar src="${jar.to.dir}" dest="temp" />
+		<ant:delete file="${jar.to.dir}" />
+		<ant:move todir="${jar.to.dir}">
+			<ant:fileset dir="temp" />
+		</ant:move>
+	</goal>
+
+	<goal name="dist">
+		<attainGoal name="all" />
+		<ant:mkdir dir="target" />
+		<ant:copy todir="target/binary/00shotoku.ear" overwrite="true">
+			<ant:fileset dir="shotoku-svn/target/00shotoku.ear" />
+		</ant:copy>
+		<ant:copy todir="target/binary" file="shotoku-aop/target/shotoku-aop.aop" />
+
+		<j:set var="jar.to.dir" value="target/binary/00shotoku.ear/shotoku-base.jar" />
+		<attainGoal name="jar-to-dir" />
+		<j:set var="jar.to.dir" value="target/binary/00shotoku.ear/shotoku-svn.ejb3" />
+		<attainGoal name="jar-to-dir" />
+		
+		<ant:tar destfile="target/shotoku-${version}-binary.tar.gz" 
+			compression="gzip"
+			basedir="target/binary"
+			excludes="**/HomeTest*,**/shotoku.properties"
+			/>
+		<ant:tar destfile="target/shotoku-${version}-source.tar.gz" 
+			compression="gzip"
+			basedir=""
+			includes="shotoku-aop/**,shotoku-base/**,shotoku-svn/**,shotoku-test/**,lib/**"
+			excludes="**/HomeTest*,**/shotoku.properties,**/target/**,**/.*,**/.*/**"
+			/>-->
+	</goal>
 </project>

Modified: trunk/forge/portal-extensions/shotoku/project.properties
===================================================================
--- trunk/forge/portal-extensions/shotoku/project.properties	2005-12-19 20:12:34 UTC (rev 1875)
+++ trunk/forge/portal-extensions/shotoku/project.properties	2005-12-19 20:39:27 UTC (rev 1876)
@@ -1,3 +1,4 @@
 maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/
 maven.junit.fork=yes
-maven.war.src=${basedir}/src/web
\ No newline at end of file
+maven.war.src=${basedir}/src/web
+version=1.0-alpha2
\ No newline at end of file

Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java	2005-12-19 20:12:34 UTC (rev 1875)
+++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java	2005-12-19 20:39:27 UTC (rev 1876)
@@ -54,17 +54,17 @@
  */
 public abstract class ContentManager {
 	/**
-	 * <code>prefix</code> - prefix of this content manager.
+	 * Prefix of this content manager.
 	 */
 	protected String prefix;
 
 	/**
-	 * <code>id</code> - id of a corresponding repository.
+	 * Id of a corresponding repository.
 	 */
 	protected String id;
 
 	/**
-	 * <code>engines</code> - a map of initialized velocity engines, The key
+	 * A map of initialized velocity engines, The key
 	 * is a string representation of parameters with which an engine was
 	 * initialized.
 	 */