[Java-link-svn] SF.net SVN: java-link: [6] trunk
Status: Pre-Alpha
Brought to you by:
welterde0
Menu
▾
▴
[Java-link-svn] SF.net SVN: java-link: [6] trunk
|
From: <wel...@us...> - 2006-05-13 20:42:24
|
Revision: 6 Author: welterde0 Date: 2006-05-13 13:41:47 -0700 (Sat, 13 May 2006) ViewCVS: http://svn.sourceforge.net/java-link/?rev=6&view=rev Log Message: ----------- buildsystem update from ant to maven2: step1 Modified Paths: -------------- trunk/client/src/main/java/org/jlink/ClientFrontend.java trunk/client/src/main/java/org/jlink/ClientNetwork.java trunk/client/src/main/java/org/jlink/client/frontend/MainFrame.java trunk/client/src/main/java/org/jlink/client/frontend/menu/MainMenu.java trunk/client/src/main/java/org/jlink/client/frontend/theme/Theme.java trunk/client/src/main/java/org/jlink/client/frontend/theme/ThemeManager.java trunk/client/src/main/java/org/jlink/client/gui/MenuBean.java trunk/client/src/main/java/org/jlink/frontend/WindowManagerImpl.java trunk/server/src/main/java/org/jlink/ServerMain.java trunk/server/src/main/java/org/jlink/ServerNetwork.java trunk/server/src/main/java/org/jlink/server/net/NetworkBackend.java trunk/share/src/main/java/org/jlink/net/ConnectionHandler.java Added Paths: ----------- trunk/client/ trunk/client/nbproject/ trunk/client/nbproject/mavencall.xml trunk/client/nbproject/project.properties trunk/client/nbproject/project.xml trunk/client/pom.xml trunk/client/src/ trunk/client/src/main/ trunk/client/src/main/assembly/ trunk/client/src/main/assembly/dep.xml trunk/client/src/main/java/ trunk/client/src/site/ trunk/client/src/site/site.xml trunk/client/src/test/ trunk/root/ trunk/root/pom.xml trunk/server/ trunk/server/pom.xml trunk/server/src/ trunk/server/src/main/ trunk/server/src/main/java/ trunk/server/src/test/ trunk/share/ trunk/share/nbproject/ trunk/share/nbproject/mavencall.xml trunk/share/nbproject/project.properties trunk/share/nbproject/project.xml trunk/share/pom.xml trunk/share/src/ trunk/share/src/main/ trunk/share/src/main/assembly/ trunk/share/src/main/assembly/dep.xml trunk/share/src/main/java/ trunk/share/src/test/ trunk/templates/maven2/ trunk/templates/maven2/pom.xml Removed Paths: ------------- trunk/Client/ trunk/Server/ trunk/Share/ Added: trunk/client/nbproject/mavencall.xml =================================================================== --- trunk/client/nbproject/mavencall.xml (rev 0) +++ trunk/client/nbproject/mavencall.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,37 @@ +<project name="client" default="build" basedir=".."> + <target name="build" description="Build"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="package"/> + </exec> + </target> + <target name="clean" description="Clean"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="clean:clean"/> + </exec> + </target> + <target name="javadoc" description="Javadoc"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="site:site"/> + </exec> + </target> + <target name="run" description="Install Locally"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="install"/> + </exec> + </target> + <target name="test" description="Test Project"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="test"/> + </exec> + </target> + <target name="jalopy" description="Format Code"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="jalopy:format"/> + </exec> + </target> + <target name="refresh-project" description="Refresh Project"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="netbeans-freeform:generate-netbeans-project"/> + </exec> + </target> +</project> \ No newline at end of file Added: trunk/client/nbproject/project.properties =================================================================== --- trunk/client/nbproject/project.properties (rev 0) +++ trunk/client/nbproject/project.properties 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,5 @@ +#The netbeans freeform property file +#Sat May 13 22:20:34 CEST 2006 +local.repository=/home/tassilo/.m2/repository +mvn.path=mvn +project.directory=/home/tassilo/Documents/dev/jlink/feature_maven2/client Added: trunk/client/nbproject/project.xml =================================================================== --- trunk/client/nbproject/project.xml (rev 0) +++ trunk/client/nbproject/project.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,121 @@ +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <name>JLink Client</name> + <properties> + <property name="ant.script">nbproject/mavencall.xml</property> + <property-file>nbproject/project.properties</property-file> + </properties> + <folders> + <source-folder> + <label>src/main/java</label> + <type>java</type> + <location>src/main/java</location> + </source-folder> + <source-folder> + <label>src/test/java</label> + <type>java</type> + <location>src/test/java</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>build</target> + </action> + <action name="clean"> + <script>${ant.script}</script> + <target>clean</target> + </action> + <action name="rebuild"> + <script>${ant.script}</script> + <target>clean</target> + <target>build</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + <action name="run"> + <script>${ant.script}</script> + <target>run</target> + </action> + <action name="test"> + <script>${ant.script}</script> + <target>test</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <label>pom</label> + <location>pom.xml</location> + </source-file> + <source-file> + <label>mavencall</label> + <location>nbproject/mavencall.xml</location> + </source-file> + <source-folder style="packages"> + <label>src/main/java</label> + <location>src/main/java</location> + </source-folder> + <source-folder style="packages"> + <label>src/test/java</label> + <location>src/test/java</location> + </source-folder> + <source-folder style="tree"> + <label>src/main/resources</label> + <location>src/main/resources</location> + </source-folder> + <source-folder style="tree"> + <label>src/test/resources</label> + <location>src/test/resources</location> + </source-folder> + <source-folder style="tree"> + <label>src/site</label> + <location>src/site</location> + </source-folder> + <source-folder style="tree"> + <label>target</label> + <location>target</location> + </source-folder> + </items> + <context-menu> + <action> + <script>${ant.script}</script> + <label>Refresh Project</label> + <target>refresh-project</target> + </action> + <ide-action name="build"/> + <ide-action name="clean"/> + <ide-action name="rebuild"/> + <ide-action name="javadoc"/> + <ide-action name="run"/> + <ide-action name="test"/> + <action> + <script>${ant.script}</script> + <label>Format Code</label> + <target>jalopy</target> + </action> + </context-menu> + </view> + <subprojects/> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> + <compilation-unit> + <package-root>src/main/java</package-root> + <classpath mode="compile">${local.repository}/org/jvnet/substance/core/2.2.02/core-2.2.02.jar:${local.repository}/jdom/jdom/1.0/jdom-1.0.jar:${local.repository}/org/jlink/share/0.0.1-SNAPSHOT/share-0.0.1-SNAPSHOT.jar:${local.repository}/org/jvnet/swing-layout/core/1.0/core-1.0.jar:${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath> + <built-to>target/classes</built-to> + <source-level>1.4</source-level> + </compilation-unit> + <compilation-unit> + <package-root>src/test/java</package-root> + <unit-tests/> + <classpath mode="compile">target/classes:${local.repository}/org/jvnet/substance/core/2.2.02/core-2.2.02.jar:${local.repository}/junit/junit/3.8.1/junit-3.8.1.jar:${local.repository}/jdom/jdom/1.0/jdom-1.0.jar:${local.repository}/org/jlink/share/0.0.1-SNAPSHOT/share-0.0.1-SNAPSHOT.jar:${local.repository}/org/jvnet/swing-layout/core/1.0/core-1.0.jar:${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath> + <built-to>target/test-classes</built-to> + <source-level>1.4</source-level> + </compilation-unit> + </java-data> + </configuration> +</project> \ No newline at end of file Added: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml (rev 0) +++ trunk/client/pom.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,125 @@ +<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"> +<!--//////////////////////////////////////// + /////////////General//////////////////// + /////////////////////////////////////--> + <parent> + <artifactId>yamd-root</artifactId> + <groupId>org.welterde.yamd</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jlink</groupId> + <artifactId>client</artifactId> + <packaging>jar</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>JLink Client</name> + <url>http://java-link.sf.net/</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jlink</groupId> + <artifactId>share</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jvnet.substance</groupId> + <artifactId>core</artifactId> + <version>2.2.02</version> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.jvnet.swing-layout</groupId> + <artifactId>core</artifactId> + <version>1.0</version> + </dependency> + </dependencies> +<!--//////////////////////////////////////// + /////////////Reporting////////////////// + /////////////////////////////////////--> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jxr-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </reporting> +<!--//////////////////////////////////////// + /////////////Building/////////////////// + /////////////////////////////////////--> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptor>src/main/assembly/dep.xml</descriptor> + </configuration> + </plugin> + </plugins> + </build> +<!--//////////////////////////////////////// + /////////////Deploying////////////////// + /////////////////////////////////////--> + <distributionManagement> + <site> + <id>jlink-sf</id> + <url>scp://shell.sf.net/home/groups/j/ja/java-link/htdocs/maven2/client</url> + </site> + </distributionManagement> +<!--//////////////////////////////////////// + /////////////Include from root////////// + /////////////////////////////////////--> + <ciManagement> + <system>cruisecontrol</system> + <url>http://welterde.i2p/cruisecontrol/</url> + </ciManagement> + <issueManagement> + <system>sourceforge</system> + <url>http://sourceforge.net/tracker/?group_id=162264</url> + </issueManagement> + <developers> + <developer> + <id>welterde</id> + <email>wel...@ar...</email> + </developer> + </developers> + <scm> + <connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</connection> + <url>http://svn.sourceforge.net/viewcvs.cgi/java-link/</url> + </scm> +</project> Added: trunk/client/src/main/assembly/dep.xml =================================================================== --- trunk/client/src/main/assembly/dep.xml (rev 0) +++ trunk/client/src/main/assembly/dep.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,20 @@ +<assembly> + <id>deps</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> +</assembly> Copied: trunk/client/src/main/java (from rev 5, trunk/Client/src) Modified: trunk/client/src/main/java/org/jlink/ClientFrontend.java =================================================================== --- trunk/Client/src/org/jlink/ClientFrontend.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/ClientFrontend.java 2006-05-13 20:41:47 UTC (rev 6) @@ -80,12 +80,12 @@ c.destroy(); return null; } - ret.log.debug("is ok, d={}", d); + ret.log.debug("is ok, d=" + d); if(Options.FRONTEND_VIDEO_FULLSCREEN) { ret.log.debug("calculating screen mp"); ret.mx = d.getWidth() / 1024; ret.my = d.getHeight() / 768; - ret.log.debug("done, mx={}, my={}", ret.mx, ret.my); + ret.log.debug("done, mx=" + ret.mx + ", my=" + ret.my); ret.root = new MainFrame("JLink", d, ret.mx, ret.my); } else { ret.root = new MainFrame("JLink", new Dimension(1024, 768), ret.mx, ret.my); @@ -186,7 +186,7 @@ } public void setServerHost(String nhost) { - log.debug("Frontend::setServerHost({}) delegated", nhost); + log.debug("Frontend::setServerHost(" + nhost + ") delegated"); this.modCore.setServerHost(nhost); } Modified: trunk/client/src/main/java/org/jlink/ClientNetwork.java =================================================================== --- trunk/Client/src/org/jlink/ClientNetwork.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/ClientNetwork.java 2006-05-13 20:41:47 UTC (rev 6) @@ -91,7 +91,7 @@ if(port <= 0) throw new IllegalArgumentException(); ConnectionHandler h = null; - log.info("connecting to {}:{}", host, port); + log.info("connecting to " + host + ":" + port); try { this.connectSock = new Socket(host, port); log.debug("connected, creating Handler"); Modified: trunk/client/src/main/java/org/jlink/client/frontend/MainFrame.java =================================================================== --- trunk/Client/src/org/jlink/client/frontend/MainFrame.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/client/frontend/MainFrame.java 2006-05-13 20:41:47 UTC (rev 6) @@ -52,7 +52,7 @@ public MainFrame(String title, Dimension dim, double mx, double my) { this.log = Logger.getLogger("jlink.frontend.mainframe"); - log.debug("created Object(MainFrame), Title: {}", title); + log.debug("created Object(MainFrame), Title: " + title); //creating Frame/Window log.debug("creating frame"); Modified: trunk/client/src/main/java/org/jlink/client/frontend/menu/MainMenu.java =================================================================== --- trunk/Client/src/org/jlink/client/frontend/menu/MainMenu.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/client/frontend/menu/MainMenu.java 2006-05-13 20:41:47 UTC (rev 6) @@ -135,7 +135,7 @@ private ImageIcon getIcon(String p) { - log.debug("loading image: {}", p); + log.debug("loading image: " + p); Image i = this.cur.getImage(p); log.debug("scaling"); i = i.getScaledInstance(54, 54, Image.SCALE_SMOOTH); Modified: trunk/client/src/main/java/org/jlink/client/frontend/theme/Theme.java =================================================================== --- trunk/Client/src/org/jlink/client/frontend/theme/Theme.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/client/frontend/theme/Theme.java 2006-05-13 20:41:47 UTC (rev 6) @@ -51,7 +51,7 @@ Theme ret = null; ret = new Theme(); ret.log = Logger.getLogger("jlink.frontend.theme"); - ret.log.debug("loading Theme from {}", dir.getAbsolutePath()); + ret.log.debug("loading Theme from " + dir.getAbsolutePath()); ret.dir = dir; @@ -80,7 +80,7 @@ if(maxMissing < 0) throw new IllegalArgumentException("maxMissing found: [" + maxMissing + "] required: >= 0"); NDC.push(this.name); - log.debug("Theme::{}::validate({})", this.name, maxMissing); + log.debug("Theme::" + this.name + "::validate(" + maxMissing + ")"); NDC.push("validate"); log.debug("checking MainMenu images"); @@ -127,7 +127,7 @@ //Image Operations public Image getImage(String i) { - log.debug("ImageRequest: {}", i); + log.debug("ImageRequest: " + i); File f = null; f = new File(this.dir, i); //log.debug("checking existence of: {}", f.getAbsolutePath()); Modified: trunk/client/src/main/java/org/jlink/client/frontend/theme/ThemeManager.java =================================================================== --- trunk/Client/src/org/jlink/client/frontend/theme/ThemeManager.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/client/frontend/theme/ThemeManager.java 2006-05-13 20:41:47 UTC (rev 6) @@ -45,7 +45,7 @@ //loading Methods public void load(File dir) { - log.info("loading Themes from {}", dir); + log.info("loading Themes from " + dir); if(!dir.isDirectory()) return; File[] t = dir.listFiles(); @@ -53,7 +53,7 @@ return; int i = 0; while(i < t.length) { - log.debug("checking {}", t[i]); + log.debug("checking " + t[i]); if(!t[i].isDirectory()) { log.debug("isnt directory"); i++; @@ -70,7 +70,7 @@ } public void loadTheme(File d) { Theme t = Theme.load(d); - log.info("loaded Theme: {}", t.getName()); + log.info("loaded Theme: " + t.getName()); this.db.add(t); } Modified: trunk/client/src/main/java/org/jlink/client/gui/MenuBean.java =================================================================== --- trunk/Client/src/org/jlink/client/gui/MenuBean.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/client/gui/MenuBean.java 2006-05-13 20:41:47 UTC (rev 6) @@ -65,18 +65,18 @@ //Buttons public void addButton(String id, Icon ico, int x, int y, int w, int h, String tooltip) { Logger log = Logger.getLogger("jlink.gui.beans.menu"); - log.debug("addButton(...) called id={}", id); + log.debug("addButton(...) called id=" + id); JButton b = new JButton(ico); b.setActionCommand(id); log.debug("calculating"); int x0 = (int) (x * mx); - log.debug("x, pre={}, suf={}", x, x0); + log.debug("x, pre=" + x + ", suf=" + x0); int x1 = (int) (w * mx); - log.debug("w pre={}, suf={}", w, x1); + log.debug("w pre=" + w + ", suf=" + x1); int y0 = (int) (y * my); - log.debug("y pre={}, suf={}", y, y0); + log.debug("y pre=" + y + ", suf=" + y0); int y1 = (int) (h * my); - log.debug("h pre={}, suf={}", h, y1); + log.debug("h pre=" + h + ", suf="+ y1); b.setBounds(x0, y0, x1, y1); b.setToolTipText(tooltip); this.c.add(b); Modified: trunk/client/src/main/java/org/jlink/frontend/WindowManagerImpl.java =================================================================== --- trunk/Client/src/org/jlink/frontend/WindowManagerImpl.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/client/src/main/java/org/jlink/frontend/WindowManagerImpl.java 2006-05-13 20:41:47 UTC (rev 6) @@ -56,7 +56,7 @@ } public void addWindow(String id, Window win) { - log.trace("entering method addWindow({}, {}", id, win); + log.trace("entering method addWindow(" + id + ", " + win + ")"); if(id == null) throw new NullPointerException(); Added: trunk/client/src/site/site.xml =================================================================== --- trunk/client/src/site/site.xml (rev 0) +++ trunk/client/src/site/site.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="JLink Client"> + <bannerRight> + <src>http://sflogo.sourceforge.net/sflogo.php?group_id=162264&type=3</src> + </bannerRight> + <body> + ${reports} + </body> +</project> Added: trunk/root/pom.xml =================================================================== --- trunk/root/pom.xml (rev 0) +++ trunk/root/pom.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +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.jlink</groupId> + <artifactId>root</artifactId> + <packaging>pom</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>JLink Root</name> + <url>http://java-link.sf.net/</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + <ciManagement> + <system>cruisecontrol</system> + <url>http://welterde.i2p/cruisecontrol/</url> + </ciManagement> + <issueManagement> + <system>sourceforge</system> + <url>http://sourceforge.net/tracker/?group_id=162264</url> + </issueManagement> + <developers> + <developer> + <id>welterde</id> + <email>wel...@ar...</email> + </developer> + </developers> + <scm> + <connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</connection> + <url>http://svn.sourceforge.net/viewcvs.cgi/java-link/</url> + </scm> +</project> Added: trunk/server/pom.xml =================================================================== --- trunk/server/pom.xml (rev 0) +++ trunk/server/pom.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,117 @@ +<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"> +<!--//////////////////////////////////////// + /////////////General//////////////////// + /////////////////////////////////////--> + <parent> + <artifactId>yamd-root</artifactId> + <groupId>org.welterde.yamd</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jlink</groupId> + <artifactId>server</artifactId> + <packaging>jar</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>JLink Server</name> + <url>http://java-link.sf.net/</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jlink</groupId> + <artifactId>share</artifactId> + <version>0.0.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + <scope>compile</scope> + </dependency> + </dependencies> +<!--//////////////////////////////////////// + /////////////Reporting////////////////// + /////////////////////////////////////--> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jxr-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </reporting> +<!--//////////////////////////////////////// + /////////////Building/////////////////// + /////////////////////////////////////--> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptor>src/main/assembly/dep.xml</descriptor> + </configuration> + </plugin> + </plugins> + </build> +<!--//////////////////////////////////////// + /////////////Deploying////////////////// + /////////////////////////////////////--> + <distributionManagement> + <site> + <id>jlink-sf</id> + <url>scp://shell.sf.net/home/groups/j/ja/java-link/htdocs/maven2/server</url> + </site> + </distributionManagement> +<!--//////////////////////////////////////// + /////////////Include from root////////// + /////////////////////////////////////--> + <ciManagement> + <system>cruisecontrol</system> + <url>http://welterde.i2p/cruisecontrol/</url> + </ciManagement> + <issueManagement> + <system>sourceforge</system> + <url>http://sourceforge.net/tracker/?group_id=162264</url> + </issueManagement> + <developers> + <developer> + <id>welterde</id> + <email>wel...@ar...</email> + </developer> + </developers> + <scm> + <connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</connection> + <url>http://svn.sourceforge.net/viewcvs.cgi/java-link/</url> + </scm> +</project> Copied: trunk/server/src/main/java (from rev 5, trunk/Server/src) Modified: trunk/server/src/main/java/org/jlink/ServerMain.java =================================================================== --- trunk/Server/src/org/jlink/ServerMain.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/server/src/main/java/org/jlink/ServerMain.java 2006-05-13 20:41:47 UTC (rev 6) @@ -36,7 +36,6 @@ import org.apache.log4j.FileAppender; import org.apache.log4j.PatternLayout; import org.apache.log4j.Level; -import org.apache.log4j.filter.LevelRangeFilter; import org.apache.log4j.ConsoleAppender; /** @@ -92,7 +91,7 @@ log.info("pre-compiling some classes"); boolean b = false; b = b || Compiler.compileClass(ServerNetwork.class); - log.debug("check for enabled compiling result 1: {}", b); + log.debug("check for enabled compiling result 1: " + b); //TODO: do some more checks if(b) { //compile more classes @@ -112,6 +111,6 @@ log.debug("############System############"); log.debug("##########Information#########"); log.debug("##############################"); - log.debug("System.compiler: {}", System.getProperty("java.compiler")); + log.debug("System.compiler: " + System.getProperty("java.compiler")); } } Modified: trunk/server/src/main/java/org/jlink/ServerNetwork.java =================================================================== --- trunk/Server/src/org/jlink/ServerNetwork.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/server/src/main/java/org/jlink/ServerNetwork.java 2006-05-13 20:41:47 UTC (rev 6) @@ -61,7 +61,7 @@ //creating other Parts ret.log.debug("Network::createParts()"); try { - ret.log.debug("trying to listen on Port: {}", Options.NETWORK_LISTEN_PORT); + ret.log.debug("trying to listen on Port: " + Options.NETWORK_LISTEN_PORT); ret.mod_back = NetworkBackend.listen(ret, Options.NETWORK_LISTEN_PORT); ret.log.debug("ok we're listening"); } catch (IOException ex) { Modified: trunk/server/src/main/java/org/jlink/server/net/NetworkBackend.java =================================================================== --- trunk/Server/src/org/jlink/server/net/NetworkBackend.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/server/src/main/java/org/jlink/server/net/NetworkBackend.java 2006-05-13 20:41:47 UTC (rev 6) @@ -53,7 +53,7 @@ NetworkBackend ret = null; ret = new NetworkBackend(); ret.log = Logger.getLogger("jlink.net.backend"); - ret.log.info("NetworkBackend::listen({})", port); + ret.log.info("NetworkBackend::listen(" + port + ")"); ret.mod_net = net; //creating Socket @@ -115,7 +115,7 @@ Socket cur = this.conSock.accept(); this.conCount++; NDC.push("" + this.conCount); - log.info("got Connection from {}", cur.getInetAddress()); + log.info("got Connection from " + cur.getInetAddress()); NDC.push("init"); log.debug("creating ConnectionHandler"); ConnectionHandler h = ConnectionHandler.connect(cur); Added: trunk/share/nbproject/mavencall.xml =================================================================== --- trunk/share/nbproject/mavencall.xml (rev 0) +++ trunk/share/nbproject/mavencall.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,37 @@ +<project name="share" default="build" basedir=".."> + <target name="build" description="Build"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="package"/> + </exec> + </target> + <target name="clean" description="Clean"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="clean:clean"/> + </exec> + </target> + <target name="javadoc" description="Javadoc"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="site:site"/> + </exec> + </target> + <target name="run" description="Install Locally"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="install"/> + </exec> + </target> + <target name="test" description="Test Project"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="test"/> + </exec> + </target> + <target name="jalopy" description="Format Code"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="jalopy:format"/> + </exec> + </target> + <target name="refresh-project" description="Refresh Project"> + <exec dir="${basedir}" executable="${mvn.path}"> + <arg line="netbeans-freeform:generate-netbeans-project"/> + </exec> + </target> +</project> \ No newline at end of file Added: trunk/share/nbproject/project.properties =================================================================== --- trunk/share/nbproject/project.properties (rev 0) +++ trunk/share/nbproject/project.properties 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,5 @@ +#The netbeans freeform property file +#Sat May 13 22:20:43 CEST 2006 +local.repository=/home/tassilo/.m2/repository +mvn.path=mvn +project.directory=/home/tassilo/Documents/dev/jlink/feature_maven2/share Added: trunk/share/nbproject/project.xml =================================================================== --- trunk/share/nbproject/project.xml (rev 0) +++ trunk/share/nbproject/project.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,121 @@ +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <name>JLink Share</name> + <properties> + <property name="ant.script">nbproject/mavencall.xml</property> + <property-file>nbproject/project.properties</property-file> + </properties> + <folders> + <source-folder> + <label>src/main/java</label> + <type>java</type> + <location>src/main/java</location> + </source-folder> + <source-folder> + <label>src/test/java</label> + <type>java</type> + <location>src/test/java</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>build</target> + </action> + <action name="clean"> + <script>${ant.script}</script> + <target>clean</target> + </action> + <action name="rebuild"> + <script>${ant.script}</script> + <target>clean</target> + <target>build</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + <action name="run"> + <script>${ant.script}</script> + <target>run</target> + </action> + <action name="test"> + <script>${ant.script}</script> + <target>test</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <label>pom</label> + <location>pom.xml</location> + </source-file> + <source-file> + <label>mavencall</label> + <location>nbproject/mavencall.xml</location> + </source-file> + <source-folder style="packages"> + <label>src/main/java</label> + <location>src/main/java</location> + </source-folder> + <source-folder style="packages"> + <label>src/test/java</label> + <location>src/test/java</location> + </source-folder> + <source-folder style="tree"> + <label>src/main/resources</label> + <location>src/main/resources</location> + </source-folder> + <source-folder style="tree"> + <label>src/test/resources</label> + <location>src/test/resources</location> + </source-folder> + <source-folder style="tree"> + <label>src/site</label> + <location>src/site</location> + </source-folder> + <source-folder style="tree"> + <label>target</label> + <location>target</location> + </source-folder> + </items> + <context-menu> + <action> + <script>${ant.script}</script> + <label>Refresh Project</label> + <target>refresh-project</target> + </action> + <ide-action name="build"/> + <ide-action name="clean"/> + <ide-action name="rebuild"/> + <ide-action name="javadoc"/> + <ide-action name="run"/> + <ide-action name="test"/> + <action> + <script>${ant.script}</script> + <label>Format Code</label> + <target>jalopy</target> + </action> + </context-menu> + </view> + <subprojects/> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> + <compilation-unit> + <package-root>src/main/java</package-root> + <classpath mode="compile">${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath> + <built-to>target/classes</built-to> + <source-level>1.4</source-level> + </compilation-unit> + <compilation-unit> + <package-root>src/test/java</package-root> + <unit-tests/> + <classpath mode="compile">target/classes:${local.repository}/junit/junit/3.8.1/junit-3.8.1.jar:${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath> + <built-to>target/test-classes</built-to> + <source-level>1.4</source-level> + </compilation-unit> + </java-data> + </configuration> +</project> \ No newline at end of file Added: trunk/share/pom.xml =================================================================== --- trunk/share/pom.xml (rev 0) +++ trunk/share/pom.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,111 @@ +<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"> +<!--//////////////////////////////////////// + /////////////General//////////////////// + /////////////////////////////////////--> + <parent> + <artifactId>yamd-root</artifactId> + <groupId>org.welterde.yamd</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jlink</groupId> + <artifactId>share</artifactId> + <packaging>jar</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>JLink Share</name> + <url>http://java-link.sf.net/</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + <scope>compile</scope> + </dependency> + </dependencies> + <!--//////////////////////////////////////// + /////////////Reporting////////////////// + /////////////////////////////////////--> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jxr-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </reporting> +<!--//////////////////////////////////////// + /////////////Building/////////////////// + /////////////////////////////////////--> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptor>src/main/assembly/dep.xml</descriptor> + </configuration> + </plugin> + </plugins> + </build> +<!--//////////////////////////////////////// + /////////////Deploying////////////////// + /////////////////////////////////////--> + <distributionManagement> + <site> + <id>jlink-sf</id> + <url>scp://shell.sf.net/home/groups/j/ja/java-link/htdocs/maven2/share</url> + </site> + </distributionManagement> +<!--//////////////////////////////////////// + /////////////Include from root////////// + /////////////////////////////////////--> + <ciManagement> + <system>cruisecontrol</system> + <url>http://welterde.i2p/cruisecontrol/</url> + </ciManagement> + <issueManagement> + <system>sourceforge</system> + <url>http://sourceforge.net/tracker/?group_id=162264</url> + </issueManagement> + <developers> + <developer> + <id>welterde</id> + <email>wel...@ar...</email> + </developer> + </developers> + <scm> + <connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</connection> + <url>http://svn.sourceforge.net/viewcvs.cgi/java-link/</url> + </scm> +</project> Added: trunk/share/src/main/assembly/dep.xml =================================================================== --- trunk/share/src/main/assembly/dep.xml (rev 0) +++ trunk/share/src/main/assembly/dep.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,20 @@ +<assembly> + <id>deps</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> +</assembly> Copied: trunk/share/src/main/java (from rev 5, trunk/Share/src) Modified: trunk/share/src/main/java/org/jlink/net/ConnectionHandler.java =================================================================== --- trunk/Share/src/org/jlink/net/ConnectionHandler.java 2006-05-12 18:06:26 UTC (rev 5) +++ trunk/share/src/main/java/org/jlink/net/ConnectionHandler.java 2006-05-13 20:41:47 UTC (rev 6) @@ -129,7 +129,7 @@ ConnectionHandler ret = null; ret = new ConnectionHandler(); ret.log = Logger.getLogger("jlink.network.connection_andler"); - ret.log.debug("ConnectionHandler created, remote host={}", s.getInetAddress()); + ret.log.debug("ConnectionHandler created, remote host=" + s.getInetAddress()); ret.sock = s; ret.log.debug("creating Streams"); Added: trunk/templates/maven2/pom.xml =================================================================== --- trunk/templates/maven2/pom.xml (rev 0) +++ trunk/templates/maven2/pom.xml 2006-05-13 20:41:47 UTC (rev 6) @@ -0,0 +1,105 @@ +<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"> +<!--//////////////////////////////////////// + /////////////General//////////////////// + /////////////////////////////////////--> + <parent> + <artifactId>yamd-root</artifactId> + <groupId>org.welterde.yamd</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jlink</groupId> + <artifactId>${name}</artifactId> + <packaging>jar</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>JLink ${Name}</name> + <url>http://java-link.sf.net/</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> +<!--//////////////////////////////////////// + /////////////Reporting////////////////// + /////////////////////////////////////--> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jxr-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </reporting> +<!--//////////////////////////////////////// + /////////////Building/////////////////// + /////////////////////////////////////--> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptor>src/main/assembly/dep.xml</descriptor> + </configuration> + </plugin> + </plugins> + </build> +<!--//////////////////////////////////////// + /////////////Deploying////////////////// + /////////////////////////////////////--> + <distributionManagement> + <site> + <id>jlink-sf</id> + <url>scp://shell.sf.net/home/groups/j/ja/java-link/htdocs/maven2/${name}</url> + </site> + </distributionManagement> +<!--//////////////////////////////////////// + /////////////Include from root////////// + /////////////////////////////////////--> + <ciManagement> + <system>cruisecontrol</system> + <url>http://welterde.i2p/cruisecontrol/</url> + </ciManagement> + <issueManagement> + <system>sourceforge</system> + <url>http://sourceforge.net/tracker/?group_id=162264</url> + </issueManagement> + <developers> + <developer> + <id>welterde</id> + <email>wel...@ar...</email> + </developer> + </developers> + <scm> + <connection>scm:svn:https://svn.sourceforge.net/svnroot/javalink</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. |
