You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/01/18 20:27:05 UTC

svn commit: r735527 - in /webservices/commons/trunk/modules/tcpmon: ./ assembly/ modules/tcpmon-core/ modules/tcpmon-core/src/ modules/tcpmon-core/src/main/ modules/tcpmon-core/src/main/java/ modules/tcpmon-core/src/main/java/org/ modules/tcpmon-core/s...

Author: veithen
Date: Sun Jan 18 11:27:03 2009
New Revision: 735527

URL: http://svn.apache.org/viewvc?rev=735527&view=rev
Log:
Moved files to standard Maven 2 locations.

Added:
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Relay.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/SlowLinkSimulator.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/SlowLinkSimulator.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/TCPMonBundle.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/TCPMonBundle.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/TcpTunnel.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/TcpTunnel.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/   (props changed)
      - copied from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/org/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/org/apache/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/org/apache/ws/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/org/apache/ws/commons/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/org/apache/ws/commons/tcpmon/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/org/apache/ws/commons/tcpmon/tcpmon.properties   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/tcpmon.properties
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/   (props changed)
      - copied from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/resources/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/resources/icons/   (props changed)
      - copied from r735367, webservices/commons/trunk/modules/tcpmon/resources/eclipse/icons/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/resources/plugin.xml   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/resources/eclipse/plugin.xml
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/plugin.xml   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/resources/idea/plugin.xml
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/org/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/org/apache/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/org/apache/ws/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/org/apache/ws/commons/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/org/apache/ws/commons/tcpmon/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/org/apache/ws/commons/tcpmon/idea/   (props changed)
      - copied from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/idea/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/AdminPane.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/AdminPane.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Connection.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Connection.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/JTextAreaWriter.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/JTextAreaWriter.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Listener.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Sender.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Sender.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/TCPMon.java   (props changed)
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/TCPMon.java
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/scripts/   (props changed)
      - copied from r735519, webservices/commons/trunk/modules/tcpmon/scripts/
    webservices/commons/trunk/modules/tcpmon/src/main/
    webservices/commons/trunk/modules/tcpmon/src/main/assembly/   (props changed)
      - copied from r735460, webservices/commons/trunk/modules/tcpmon/assembly/
    webservices/commons/trunk/modules/tcpmon/src/main/assembly/src.xml
      - copied unchanged from r735480, webservices/commons/trunk/modules/tcpmon/assembly/src.xml
    webservices/commons/trunk/modules/tcpmon/src/site/
    webservices/commons/trunk/modules/tcpmon/src/site/resources/
    webservices/commons/trunk/modules/tcpmon/src/site/resources/download.cgi   (props changed)
      - copied unchanged from r735519, webservices/commons/trunk/modules/tcpmon/xdocs/download.cgi
    webservices/commons/trunk/modules/tcpmon/src/site/resources/images/   (props changed)
      - copied from r735519, webservices/commons/trunk/modules/tcpmon/xdocs/images/
    webservices/commons/trunk/modules/tcpmon/src/site/site.xml
      - copied unchanged from r735367, webservices/commons/trunk/modules/tcpmon/site/site.xml
    webservices/commons/trunk/modules/tcpmon/src/site/xdoc/
    webservices/commons/trunk/modules/tcpmon/src/site/xdoc/download.xml   (props changed)
      - copied unchanged from r735519, webservices/commons/trunk/modules/tcpmon/xdocs/download.xml
    webservices/commons/trunk/modules/tcpmon/src/site/xdoc/tcpmontutorial.xml
      - copied unchanged from r735519, webservices/commons/trunk/modules/tcpmon/xdocs/tcpmontutorial.xml
Removed:
    webservices/commons/trunk/modules/tcpmon/assembly/
    webservices/commons/trunk/modules/tcpmon/resources/
    webservices/commons/trunk/modules/tcpmon/scripts/
    webservices/commons/trunk/modules/tcpmon/site/
    webservices/commons/trunk/modules/tcpmon/src/org/
    webservices/commons/trunk/modules/tcpmon/xdocs/
Modified:
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/assembly/plugin-assembly.xml
    webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml
    webservices/commons/trunk/modules/tcpmon/pom.xml
    webservices/commons/trunk/modules/tcpmon/src/main/assembly/bin.xml

Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml?rev=735527&r1=735526&r2=735527&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml Sun Jan 18 11:27:03 2009
@@ -38,26 +38,12 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>../../src</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>../../src</directory>
-                <includes>
-                    <include>org/apache/ws/commons/tcpmon/tcpmon.properties</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.3</source>
                     <target>1.3</target>
-                    <includes>
-                        <include>org/apache/ws/commons/tcpmon/SlowLinkSimulator.java</include>
-                        <include>org/apache/ws/commons/tcpmon/TCPMonBundle.java</include>
-                        <include>org/apache/ws/commons/tcpmon/core/**/*.java</include>
-                    </includes>
                 </configuration>
             </plugin>
             <plugin>

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/SlowLinkSimulator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/SlowLinkSimulator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/TCPMonBundle.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/TcpTunnel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/TcpTunnel.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/resources/org/apache/ws/commons/tcpmon/tcpmon.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml?rev=735527&r1=735526&r2=735527&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml Sun Jan 18 11:27:03 2009
@@ -58,21 +58,12 @@
         </repository>
     </repositories>
     <build>
-        <sourceDirectory>../../src</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>../../resources/eclipse</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.3</source>
                     <target>1.3</target>
-                    <includes>
-                        <include>org/apache/ws/commons/tcpmon/eclipse/**/*.java</include>
-                    </includes>
                 </configuration>
             </plugin>
             <plugin>

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/resources/icons/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/resources/plugin.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/plugin.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml?rev=735527&r1=735526&r2=735527&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml Sun Jan 18 11:27:03 2009
@@ -46,16 +46,12 @@
         </dependency>        
     </dependencies>
     <build>
-        <sourceDirectory>../../src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.3</source>
                     <target>1.3</target>
-                    <includes>
-                        <include>org/apache/ws/commons/tcpmon/idea/**/*.java</include>
-                    </includes>
                 </configuration>
             </plugin>
             <plugin>

Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/assembly/plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/assembly/plugin-assembly.xml?rev=735527&r1=735526&r2=735527&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/assembly/plugin-assembly.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/assembly/plugin-assembly.xml Sun Jan 18 11:27:03 2009
@@ -28,8 +28,11 @@
             <outputDirectory>classes</outputDirectory>
          </fileSet>
         <fileSet>
-            <directory>${basedir}/../../resources/idea</directory>
+            <directory>/</directory>
             <outputDirectory>META-INF</outputDirectory>
+            <includes>
+                <include>plugin.xml</include>
+            </includes>
          </fileSet>
     </fileSets>
     <dependencySets>

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/src/main/java/org/apache/ws/commons/tcpmon/idea/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml?rev=735527&r1=735526&r2=735527&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml Sun Jan 18 11:27:03 2009
@@ -38,21 +38,12 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>../../src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.3</source>
                     <target>1.3</target>
-                    <includes>
-                        <include>org/apache/ws/commons/tcpmon/AdminPane.java</include>
-                        <include>org/apache/ws/commons/tcpmon/Connection.java</include>
-                        <include>org/apache/ws/commons/tcpmon/JTextAreaWriter.java</include>
-                        <include>org/apache/ws/commons/tcpmon/Listener.java</include>
-                        <include>org/apache/ws/commons/tcpmon/Sender.java</include>
-                        <include>org/apache/ws/commons/tcpmon/TCPMon.java</include>
-                    </includes>
                 </configuration>
             </plugin>
             <plugin>

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/AdminPane.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/AdminPane.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Connection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Connection.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/JTextAreaWriter.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Sender.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Sender.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/TCPMon.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/TCPMon.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/scripts/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: webservices/commons/trunk/modules/tcpmon/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/pom.xml?rev=735527&r1=735526&r2=735527&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/pom.xml Sun Jan 18 11:27:03 2009
@@ -70,40 +70,14 @@
                 <artifactId>maven-site-plugin</artifactId>
                 <version>2.0-beta-7</version>
                 <inherited>false</inherited>
-                <configuration>
-                    <xdocDirectory>xdocs</xdocDirectory>
-                    <siteDirectory>site</siteDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.3</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>run</goal> 
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy todir="target/site">
-                                    <fileset dir="xdocs">
-                                        <exclude name="**/*.xml"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
                     <descriptors>
-                        <descriptor>assembly/bin.xml</descriptor>
-                        <descriptor>assembly/src.xml</descriptor>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                        <descriptor>src/main/assembly/src.xml</descriptor>
                     </descriptors>
                 </configuration>
             </plugin>

Propchange: webservices/commons/trunk/modules/tcpmon/src/main/assembly/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: webservices/commons/trunk/modules/tcpmon/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/main/assembly/bin.xml?rev=735527&r1=735460&r2=735527&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/src/main/assembly/bin.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/src/main/assembly/bin.xml Sun Jan 18 11:27:03 2009
@@ -33,7 +33,7 @@
             <filtered>true</filtered>
         </fileSet>
         <fileSet>
-            <directory>scripts</directory>
+            <directory>modules/tcpmon-ui/src/main/scripts</directory>
             <outputDirectory>build</outputDirectory>
             <filtered>true</filtered>
         </fileSet>

Propchange: webservices/commons/trunk/modules/tcpmon/src/site/resources/download.cgi
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/src/site/resources/images/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/tcpmon/src/site/xdoc/download.xml
------------------------------------------------------------------------------
    svn:mergeinfo =