[Java-link-svn] SF.net SVN: java-link: [10] trunk

[<wel...@us...>]

Revision: 10
          http://svn.sourceforge.net/java-link/?rev=10&view=rev
Author:   welterde0
Date:     2006-10-07 14:28:11 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
build(X/nbproject/build.xml):
	updated build scripts to backup themselfs before mvn update is run
	added link to nbproject/project.properties file with default setting for maven
	added link to nbproject/private/private.properties file for your own setting of maven path
build(build.xml):
	added support for mirrors(actually just one heanet)
	added libs for share(jfunutil)
	added libs for client(swing-layout.jar, substance)
config(X/pom.xml)
	fixed svn URL
	fixed server maven site config

Modified Paths:
--------------
    trunk/build.xml
    trunk/client/nbproject/mavencall.xml
    trunk/client/pom.xml
    trunk/server/nbproject/mavencall.xml
    trunk/server/pom.xml
    trunk/share/nbproject/mavencall.xml
    trunk/share/pom.xml

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2006-09-02 18:54:25 UTC (rev 9)
+++ trunk/build.xml	2006-10-07 21:28:11 UTC (rev 10)
@@ -24,8 +24,21 @@
 <project name="jlink" default="default" basedir=".">
     <!--Global-->
     
+	<!--Sourceforge Mirrors; choose one if th other dont work-->
+	<property name="sf.mirror" value="heanet"/>
+	<!--
+		TODO: other mirrors
+	-->
     <!--Targets-->
-    <target name="share">
+    <target name="share-deps">
+        <echo message="downloading dep client/jfunutil.jar"/>
+	<get src="http://${sf.mirror}.dl.sourceforge.net/sourceforge/java-link/jfunutil-5.0.jar" dest="tmp/substance.jar"/>
+	<exec executable="mvn">
+	    <arg line="install:install-file -DgroupId=yan -DartifactId=jfunutil -Dversion=5.0 -Dpackaging=jar -Dfile=tmp/jfunutil.jar"/>
+	</exec>
+	<echo message="[done]"/>
+    </target>
+    <target name="share" depends="share-deps">
 	<exec executable="mvn" dir="share" output="share.build.log" failonerror="true">
 	    <arg value="compile"/>
 	</exec>
@@ -49,7 +62,7 @@
 	<mkdir dir="tmp"/>
 	
 	<echo message="downloading dep client/lafplugin.jar"/>
-	<get src="http://dl.sourceforge.net/java-link/lafplugin-0.1.jar" dest="tmp/lafplugin.jar"/>
+	<get src="http://${sf.mirror}.dl.sourceforge.net/sourceforge/java-link/lafplugin-0.1.jar" dest="tmp/lafplugin.jar"/>
 	<echo message="installing it"/>
 	<exec executable="mvn">
 	    <arg line="install:install-file -DgroupId=org.jvnet -DartifactId=lafplugin -Dversion=0.1 -Dpackaging=jar -Dfile=tmp/lafplugin.jar"/>
@@ -57,7 +70,25 @@
 	<echo message="[done]"/>
 	
 	<echo message="downloading dep client/nanoxml.jar"/>
-	<get src="http://dl.sourceforge.net/java-link/nanoxml_lite-2.2.3.jar" dest="tmp/nanoxml.jar"/>
+	<get src="http://${sf.mirror}.dl.sourceforge.net/sourceforge/java-link/nanoxml_lite-2.2.3.jar" dest="tmp/nanoxml.jar"/>
+	<exec executable="mvn">
+	    <arg line="install:install-file -DgroupId=nanoxml -DartifactId=nanoxml -Dversion=2.2.3 -Dpackaging=jar -Dfile=tmp/nanoxml.jar"/>
+	</exec>
+	<echo message="[done]"/>
+	
+	<echo message="downloading dep client/swing-layour.jar"/>
+	<get src="http://${sf.mirror}.dl.sourceforge.net/sourceforge/java-link/swing-layout-1.0.jar" dest="tmp/swing-layout.jar"/>
+	<exec executable="mvn">
+	    <arg line="install:install-file -DgroupId=org.jvnet.swing-layout -DartifactId=core -Dversion=1.0 -Dpackaging=jar -Dfile=tmp/swing-layout.jar"/>
+	</exec>
+	<echo message="[done]"/>
+	
+	<echo message="downloading dep client/substance.jar"/>
+	<get src="http://${sf.mirror}.dl.sourceforge.net/sourceforge/java-link/substance-2.2.02.jar" dest="tmp/substance.jar"/>
+	<exec executable="mvn">
+	    <arg line="install:install-file -DgroupId=org.jvnet.substance -DartifactId=core -Dversion=2.2.02 -Dpackaging=jar -Dfile=tmp/substance.jar"/>
+	</exec>
+	<echo message="[done]"/>
     </target>
     
     <target name="client" depends="client-deps">

Modified: trunk/client/nbproject/mavencall.xml
===================================================================
--- trunk/client/nbproject/mavencall.xml	2006-09-02 18:54:25 UTC (rev 9)
+++ trunk/client/nbproject/mavencall.xml	2006-10-07 21:28:11 UTC (rev 10)
@@ -1,4 +1,6 @@
 <project name="client" default="build" basedir="..">
+  <property file="nbproject/private/private.properties"/>
+  <property file="nbproject/project.properties"/>
   <target name="build" description="Build">
     <exec dir="${basedir}" executable="${mvn.path}">
       <arg line="package"/>
@@ -30,8 +32,11 @@
     </exec>
   </target>
   <target name="refresh-project" description="Refresh Project">
+    <copy file="nbproject/mavencall.xml" tofile="nbproject/mavencall.xml.bak"/>
     <exec dir="${basedir}" executable="${mvn.path}">
       <arg line="netbeans-freeform:generate-netbeans-project"/>
     </exec>
+    <delete file="nbproject.xml"/>
+    <move file="nbproject/mavencall.xml.bak" tofile="nbproject/mavencall.xml"/>
   </target>
 </project>
\ No newline at end of file

Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml	2006-09-02 18:54:25 UTC (rev 9)
+++ trunk/client/pom.xml	2006-10-07 21:28:11 UTC (rev 10)
@@ -10,6 +10,12 @@
     <name>JLink Client</name>
     <url>http://java-link.sf.net/</url>
     <dependencies>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.2</version>
+            <scope>compile</scope>
+        </dependency>
 	<dependency>
 	    <groupId>junit</groupId>
 	    <artifactId>junit</artifactId>
@@ -52,6 +58,12 @@
 	    <version>1.0</version>
 	    <scope>compile</scope>
 	</dependency>
+	<dependency>
+	    <groupId>nanoxml</groupId>
+	    <artifactId>nanoxml</artifactId>
+	    <version>2.2.3</version>
+	    <scope>compile</scope>
+	</dependency>
     </dependencies>
 <!--////////////////////////////////////////
     /////////////Reporting//////////////////
@@ -146,7 +158,7 @@
 	</developer>
     </developers>
     <scm>
-	<connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</connection>
+	<connection>scm:svn:https://svn.sourceforge.net/svnroot/java-link</connection>
 	<url>http://svn.sourceforge.net/viewcvs.cgi/java-link/</url>
     </scm>
 </project>

Modified: trunk/server/nbproject/mavencall.xml
===================================================================
--- trunk/server/nbproject/mavencall.xml	2006-09-02 18:54:25 UTC (rev 9)
+++ trunk/server/nbproject/mavencall.xml	2006-10-07 21:28:11 UTC (rev 10)
@@ -1,4 +1,6 @@
-<project name="server" default="build" basedir="..">
+<project name="client" default="build" basedir="..">
+  <property file="nbproject/private/private.properties"/>
+  <property file="nbproject/project.properties"/>
   <target name="build" description="Build">
     <exec dir="${basedir}" executable="${mvn.path}">
       <arg line="package"/>
@@ -30,8 +32,11 @@
     </exec>
   </target>
   <target name="refresh-project" description="Refresh Project">
+    <copy file="nbproject/mavencall.xml" tofile="nbproject/mavencall.xml.bak"/>
     <exec dir="${basedir}" executable="${mvn.path}">
       <arg line="netbeans-freeform:generate-netbeans-project"/>
     </exec>
+    <delete file="nbproject.xml"/>
+    <move file="nbproject/mavencall.xml.bak" tofile="nbproject/mavencall.xml"/>
   </target>
 </project>
\ No newline at end of file

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2006-09-02 18:54:25 UTC (rev 9)
+++ trunk/server/pom.xml	2006-10-07 21:28:11 UTC (rev 10)
@@ -123,7 +123,7 @@
 	</developer>
     </developers>
     <scm>
-	<connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</connection>
+	<connection>scm:svn:https://svn.sourceforge.net/svnroot/java-link</connection>
 	<url>http://svn.sourceforge.net/viewcvs.cgi/java-link/</url>
     </scm>
 </project>

Modified: trunk/share/nbproject/mavencall.xml
===================================================================
--- trunk/share/nbproject/mavencall.xml	2006-09-02 18:54:25 UTC (rev 9)
+++ trunk/share/nbproject/mavencall.xml	2006-10-07 21:28:11 UTC (rev 10)
@@ -1,4 +1,6 @@
-<project name="share" default="build" basedir="..">
+<project name="client" default="build" basedir="..">
+  <property file="nbproject/private/private.properties"/>
+  <property file="nbproject/project.properties"/>
   <target name="build" description="Build">
     <exec dir="${basedir}" executable="${mvn.path}">
       <arg line="package"/>
@@ -30,8 +32,11 @@
     </exec>
   </target>
   <target name="refresh-project" description="Refresh Project">
+    <copy file="nbproject/mavencall.xml" tofile="nbproject/mavencall.xml.bak"/>
     <exec dir="${basedir}" executable="${mvn.path}">
       <arg line="netbeans-freeform:generate-netbeans-project"/>
     </exec>
+    <delete file="nbproject.xml"/>
+    <move file="nbproject/mavencall.xml.bak" tofile="nbproject/mavencall.xml"/>
   </target>
 </project>
\ No newline at end of file

Modified: trunk/share/pom.xml
===================================================================
--- trunk/share/pom.xml	2006-09-02 18:54:25 UTC (rev 9)
+++ trunk/share/pom.xml	2006-10-07 21:28:11 UTC (rev 10)
@@ -22,6 +22,18 @@
 	    <version>1.2.13</version>
 	    <scope>compile</scope>
 	</dependency>
+        <dependency>
+            <groupId>yan</groupId>
+            <artifactId>yan</artifactId>
+            <version>5.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>yan</groupId>
+            <artifactId>jfunutil</artifactId>
+            <version>5.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <!--////////////////////////////////////////
     /////////////Reporting//////////////////
@@ -117,7 +129,7 @@
 	</developer>
     </developers>
     <scm>
-	<connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</connection>
+	<connection>scm:svn:https://svn.sourceforge.net/svnroot/java-link</connection>
 	<url>http://svn.sourceforge.net/viewcvs.cgi/java-link/</url>
     </scm>
 </project>


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