svn commit: r1495304 - in /wookie/trunk: ./ WebContent/ WebContent/META-INF/ WebContent/WEB-INF/ WebContent/demo/ WebContent/deploy/ WebContent/error/ WebContent/shared/ WebContent/upload/ ant/ connector/java/src-test/org/ connector/java/src/main/ conn...

Fri, 21 Jun 2013 00:43:46 -0700 

Author: scottbw
Date: Fri Jun 21 07:42:00 2013
New Revision: 1495304

URL: http://svn.apache.org/r1495304
Log:
reorganised directories to fit Maven standard layout

Added:
    wookie/trunk/connector/java/src/main/
    wookie/trunk/connector/java/src/main/java/
    wookie/trunk/connector/java/src/main/java/org/
      - copied from r1494494, wookie/trunk/connector/java/src/org/
    wookie/trunk/connector/java/src/test/
    wookie/trunk/connector/java/src/test/java/
    wookie/trunk/connector/java/src/test/java/org/
      - copied from r1494494, wookie/trunk/connector/java/src-test/org/
    wookie/trunk/digsig-client/java/src/main/
    wookie/trunk/digsig-client/java/src/main/java/
    wookie/trunk/digsig-client/java/src/main/java/org/
      - copied from r1494494, wookie/trunk/digsig-client/java/src/org/
    wookie/trunk/digsig-client/java/src/main/resources/
    wookie/trunk/digsig-client/java/src/main/resources/resources/
      - copied from r1494494, wookie/trunk/digsig-client/java/resources/
    wookie/trunk/digsig-client/java/src/test/
    wookie/trunk/digsig-client/java/src/test/java/
    wookie/trunk/parser/java/src/main/
    wookie/trunk/parser/java/src/main/java/
    wookie/trunk/parser/java/src/main/java/org/
      - copied from r1494494, wookie/trunk/parser/java/src/org/
    wookie/trunk/parser/java/src/test/
    wookie/trunk/parser/java/src/test/java/
    wookie/trunk/parser/java/src/test/java/icons/
      - copied from r1494494, wookie/trunk/parser/java/src-test/icons/
    wookie/trunk/parser/java/src/test/java/org/
      - copied from r1494494, wookie/trunk/parser/java/src-test/org/
    wookie/trunk/parser/java/src/test/java/resources/
      - copied from r1494494, wookie/trunk/parser/java/src-test/resources/
    wookie/trunk/parser/java/src/test/java/update.xml
      - copied unchanged from r1494494, 
wookie/trunk/parser/java/src-test/update.xml
    wookie/trunk/src/main/
    wookie/trunk/src/main/java/
    wookie/trunk/src/main/java/META-INF/
      - copied from r1494494, wookie/trunk/src/META-INF/
    wookie/trunk/src/main/java/keys
      - copied unchanged from r1494494, wookie/trunk/src/keys
    wookie/trunk/src/main/java/log4j.properties
      - copied unchanged from r1494494, wookie/trunk/src/log4j.properties
    wookie/trunk/src/main/java/opensocial.properties
      - copied unchanged from r1494494, wookie/trunk/src/opensocial.properties
    wookie/trunk/src/main/java/org/
      - copied from r1494494, wookie/trunk/src/org/
    wookie/trunk/src/main/java/policies
      - copied unchanged from r1494494, wookie/trunk/src/policies
    wookie/trunk/src/main/java/roles.properties
      - copied unchanged from r1494494, wookie/trunk/src/roles.properties
    wookie/trunk/src/main/java/users.properties
      - copied unchanged from r1494494, wookie/trunk/src/users.properties
    wookie/trunk/src/main/java/widgetserver.properties
      - copied unchanged from r1494494, wookie/trunk/src/widgetserver.properties
    wookie/trunk/src/main/webapp/
    wookie/trunk/src/main/webapp/META-INF/
      - copied from r1494494, wookie/trunk/WebContent/META-INF/
    wookie/trunk/src/main/webapp/WEB-INF/
      - copied from r1494494, wookie/trunk/WebContent/WEB-INF/
    wookie/trunk/src/main/webapp/demo/
      - copied from r1494494, wookie/trunk/WebContent/demo/
    wookie/trunk/src/main/webapp/deploy/
      - copied from r1494494, wookie/trunk/WebContent/deploy/
    wookie/trunk/src/main/webapp/error/
      - copied from r1494494, wookie/trunk/WebContent/error/
    wookie/trunk/src/main/webapp/index.htm
      - copied unchanged from r1494494, wookie/trunk/WebContent/index.htm
    wookie/trunk/src/main/webapp/shared/
      - copied from r1494494, wookie/trunk/WebContent/shared/
    wookie/trunk/src/main/webapp/upload/
      - copied from r1494494, wookie/trunk/WebContent/upload/
    wookie/trunk/src/test/
    wookie/trunk/src/test/java/
    wookie/trunk/src/test/java/jndi.properties
      - copied unchanged from r1494494, wookie/trunk/src-tests/jndi.properties
    wookie/trunk/src/test/java/log4j.xml
      - copied unchanged from r1494494, wookie/trunk/src-tests/log4j.xml
    wookie/trunk/src/test/java/org/
      - copied from r1494494, wookie/trunk/src-tests/org/
    wookie/trunk/src/test/java/testdata/
      - copied from r1494494, wookie/trunk/src-tests/testdata/
Removed:
    wookie/trunk/WebContent/META-INF/
    wookie/trunk/WebContent/WEB-INF/
    wookie/trunk/WebContent/demo/
    wookie/trunk/WebContent/deploy/
    wookie/trunk/WebContent/error/
    wookie/trunk/WebContent/index.htm
    wookie/trunk/WebContent/shared/
    wookie/trunk/WebContent/upload/
    wookie/trunk/connector/java/src-test/org/
    wookie/trunk/connector/java/src/org/
    wookie/trunk/digsig-client/java/resources/
    wookie/trunk/digsig-client/java/src/org/
    wookie/trunk/parser/java/src-test/icons/
    wookie/trunk/parser/java/src-test/org/
    wookie/trunk/parser/java/src-test/resources/
    wookie/trunk/parser/java/src-test/update.xml
    wookie/trunk/parser/java/src/org/
    wookie/trunk/src-tests/jndi.properties
    wookie/trunk/src-tests/log4j.xml
    wookie/trunk/src-tests/org/
    wookie/trunk/src-tests/testdata/
    wookie/trunk/src/META-INF/
    wookie/trunk/src/keys
    wookie/trunk/src/log4j.properties
    wookie/trunk/src/opensocial.properties
    wookie/trunk/src/org/
    wookie/trunk/src/policies
    wookie/trunk/src/roles.properties
    wookie/trunk/src/users.properties
    wookie/trunk/src/widgetserver.properties
Modified:
    wookie/trunk/.classpath
    wookie/trunk/.project
    wookie/trunk/ant/ivy-java-common.xml
    wookie/trunk/ant/ivy-webapp-common.xml

Modified: wookie/trunk/.classpath
URL: 
http://svn.apache.org/viewvc/wookie/trunk/.classpath?rev=1495304&r1=1495303&r2=1495304&view=diff
==============================================================================
--- wookie/trunk/.classpath (original)
+++ wookie/trunk/.classpath Fri Jun 21 07:42:00 2013
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="src-tests"/>
-       <classpathentry kind="src" output="parser/java/bin" 
path="parser/java/src"/>
-       <classpathentry kind="src" output="parser/java/bin" 
path="parser/java/src-test"/>
-       <classpathentry kind="src" path="connector/java/src"/>
-       <classpathentry kind="src" path="connector/java/src-test"/>
-       <classpathentry kind="src" output="digsig-client/java/bin" 
path="digsig-client/java/src"/>
-       <classpathentry kind="con" 
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-       <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="con" 
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="src-tests"/>
+       <classpathentry kind="src" output="parser/java/bin" 
path="parser/java/src"/>
+       <classpathentry kind="src" output="parser/java/bin" 
path="parser/java/src-test"/>
+       <classpathentry kind="src" path="connector/java/src"/>
+       <classpathentry kind="src" path="connector/java/src-test"/>
+       <classpathentry kind="src" output="digsig-client/java/bin" 
path="digsig-client/java/src"/>
+       <classpathentry kind="con" 
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+       <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="con" 
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=wookie&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

Modified: wookie/trunk/.project
URL: 
http://svn.apache.org/viewvc/wookie/trunk/.project?rev=1495304&r1=1495303&r2=1495304&view=diff
==============================================================================
--- wookie/trunk/.project (original)
+++ wookie/trunk/.project Fri Jun 21 07:42:00 2013
@@ -26,5 +26,6 @@
                <nature>org.eclipse.jdt.core.javanature</nature>
                
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
                <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+               <nature>org.apache.ivyde.eclipse.ivynature</nature>
        </natures>
 </projectDescription>

Modified: wookie/trunk/ant/ivy-java-common.xml
URL: 
http://svn.apache.org/viewvc/wookie/trunk/ant/ivy-java-common.xml?rev=1495304&r1=1495303&r2=1495304&view=diff
==============================================================================
--- wookie/trunk/ant/ivy-java-common.xml (original)
+++ wookie/trunk/ant/ivy-java-common.xml Fri Jun 21 07:42:00 2013
@@ -23,8 +23,8 @@
 
        <property name="project.lib.dir" 
location="${project.webapp.dir}/WEB-INF/lib" />
 
-       <property name="project.core.src.dir" location="src" />
-       <property name="project.test.src.dir" location="src-tests" />
+       <property name="project.core.src.dir" location="src/main/java" />
+       <property name="project.test.src.dir" location="src/test/java" />
 
        <property name="project.build.classes.dir" 
location="${project.build.dir}/classes" />
        <property name="project.build.classes.test.dir" 
location="${project.build.dir}/classes-test" />

Modified: wookie/trunk/ant/ivy-webapp-common.xml
URL: 
http://svn.apache.org/viewvc/wookie/trunk/ant/ivy-webapp-common.xml?rev=1495304&r1=1495303&r2=1495304&view=diff
==============================================================================
--- wookie/trunk/ant/ivy-webapp-common.xml (original)
+++ wookie/trunk/ant/ivy-webapp-common.xml Fri Jun 21 07:42:00 2013
@@ -17,7 +17,7 @@
 -->
 <project xmlns:ivy="antlib:org.apache.ivy.ant">
 
-       <property name="project.webapp.dir" location="WebContent" />
+       <property name="project.webapp.dir" location="src/main/webapp" />
 
        <import file="ivy-java-common.xml" />

Reply via email to