You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/13 17:53:59 UTC

svn commit: r507092 - in /incubator/roller/branches/roller_4.0/sandbox/planetroller: ./ nbproject/ src/org/apache/roller/planet/tasks/ src/org/apache/roller/planet/ui/forms/ src/org/apache/roller/planet/ui/utils/ src/org/apache/roller/util/ templates/ ...

Author: snoopdave
Date: Tue Feb 13 08:53:57 2007
New Revision: 507092

URL: http://svn.apache.org/viewvc?view=rev&rev=507092
Log:
Planet has left the sandbox

Removed:
    incubator/roller/branches/roller_4.0/sandbox/planetroller/src/org/apache/roller/planet/tasks/
    incubator/roller/branches/roller_4.0/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/
    incubator/roller/branches/roller_4.0/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/ErrorBean.java
    incubator/roller/branches/roller_4.0/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/LoadableForm.java
    incubator/roller/branches/roller_4.0/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/LoadableFormFilter.java
    incubator/roller/branches/roller_4.0/sandbox/planetroller/src/org/apache/roller/planet/ui/utils/PersistenceSessionFilter.java
    incubator/roller/branches/roller_4.0/sandbox/planetroller/src/org/apache/roller/util/
    incubator/roller/branches/roller_4.0/sandbox/planetroller/templates/
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/META-INF/
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/commons-logging.properties
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/log4j.properties
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/planet.properties
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/roller.properties
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/classes/rome.properties
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/faces-config.xml
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/lib/
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/scripts/
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/WEB-INF/web.xml
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/index.jsp
    incubator/roller/branches/roller_4.0/sandbox/planetroller/web/planet-ui/
Modified:
    incubator/roller/branches/roller_4.0/sandbox/planetroller/build.xml
    incubator/roller/branches/roller_4.0/sandbox/planetroller/nbproject/project.xml

Modified: incubator/roller/branches/roller_4.0/sandbox/planetroller/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/sandbox/planetroller/build.xml?view=diff&rev=507092&r1=507091&r2=507092
==============================================================================
--- incubator/roller/branches/roller_4.0/sandbox/planetroller/build.xml (original)
+++ incubator/roller/branches/roller_4.0/sandbox/planetroller/build.xml Tue Feb 13 08:53:57 2007
@@ -45,7 +45,6 @@
     <fileset id="roller-jars" dir="${ro.tools}">
         <!-- needed for Hibernate -->
         <include name="hibernate-3.1/hibernate3.jar"/>
-        <include name="hibernate-3.1/lib/antlr.jar"/>
         <include name="hibernate-3.1/lib/asm.jar"/>
         <include name="hibernate-3.1/lib/asm-attrs.jar"/>
         <include name="hibernate-3.1/lib/cglib-2.1.3.jar"/>
@@ -65,17 +64,12 @@
         
         <!-- General dependencies -->
         <include name="lib/commons-codec-1.3.jar"/>
-        <include name="struts-1.2.4/lib/antlr.jar"/>
-        <include name="struts-1.2.4/lib/commons-lang-2.0.jar"/>
-        <include name="struts-1.2.4/lib/commons-logging.jar"/>
         <include name="struts-1.2.4/lib/commons-fileupload.jar"/>
-        <include name="struts-1.2.4/lib/commons-validator.jar"/>
-        <include name="struts-1.2.4/lib/commons-collections.jar"/>
         <include name="lib/log4j-1.2.11.jar"/>
         <include name="lib/jaxen-full.jar"/>
         <include name="lib/saxpath.jar"/>
-        <include name="lib/activation.jar"/>
-        <include name="lib/mail.jar"/>
+        <include name="buildtime/activation.jar"/>
+        <include name="buildtime/mail.jar"/>
     </fileset>
     
     <path id="planet.path">
@@ -90,12 +84,13 @@
             <include name="servlet-api.jar"/>
         </fileset>
         
-        <fileset dir="${ro.web}/WEB-INF/lib">
-            <include name="commons-logging-1.0.4.jar"/>
-            <include name="commons-lang-2.1.jar"/>  
-            <include name="myfaces-api-1.1.4.jar"/>  
-            <include name="tomahawk-1.1.3.jar"/>  
-        </fileset>                      
+        <fileset dir="./lib">
+            <include name="*.jar"/>  
+        </fileset>
+        
+        <fileset dir="./lib/struts2">
+            <include name="*.jar"/>
+        </fileset>
     </path>
     
     <path id="xdoclet.path">
@@ -192,7 +187,14 @@
             <fileset dir="../../apps/planet/build/lib">
                 <include name="roller-planet.jar"/>
             </fileset>
-        
+            
+            <fileset dir="./lib">
+                <include name="*.jar"/>  
+            </fileset>
+            
+            <fileset dir="./lib/struts2">
+                <include name="*.jar"/>
+            </fileset>
         </copy>         
 
         <copy todir="${build.webapp}">

Modified: incubator/roller/branches/roller_4.0/sandbox/planetroller/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/sandbox/planetroller/nbproject/project.xml?view=diff&rev=507092&r1=507091&r2=507092
==============================================================================
--- incubator/roller/branches/roller_4.0/sandbox/planetroller/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_4.0/sandbox/planetroller/nbproject/project.xml Tue Feb 13 08:53:57 2007
@@ -64,7 +64,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">web/WEB-INF/lib/commons-beanutils-1.7.0.jar:web/WEB-INF/lib/commons-codec-1.3.jar:web/WEB-INF/lib/commons-collections-3.1.jar:web/WEB-INF/lib/commons-digester-1.6.jar:web/WEB-INF/lib/commons-el-1.0.jar:web/WEB-INF/lib/commons-lang-2.1.jar:web/WEB-INF/lib/commons-logging-1.0.4.jar:web/WEB-INF/lib/jstl.jar:web/WEB-INF/lib/myfaces-api-1.1.4.jar:web/WEB-INF/lib/myfaces-impl-1.1.4.jar:web/WEB-INF/lib/standard.jar:web/WEB-INF/lib/tomahawk-1.1.3.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:lib/antlr.jar:lib/asm-attrs.jar:lib/asm.jar:lib/cglib-2.1.3.jar:lib/commons-fileupload.jar:lib/commons-lang-2.0.jar:lib/commons-logging.jar:lib/commons-validator.jar:lib/dom4j-1.6.1.jar:lib/ehcache-1.1.jar:lib/hibernate3.jar:lib/jaxen-full.jar:lib/jdbc2_0-stdext.jar:lib/jdom.jar:lib/jta.jar:lib/log4j-1.2.11.jar:lib/roller-business.jar:lib/roller-web.jar:lib/rome-0.8.jar:lib/rome-fetcher-0.8.jar:lib/saxpath.jar:lib/servlet-api.jar:lib/velocity-1
 .4.jar:lib/velocity-dep-1.4.jar:lib/activation.jar:lib/mail.jar:../../apps/planet/build/lib/roller-planet.jar</classpath>
+                <classpath mode="compile">web/WEB-INF/lib/commons-codec-1.3.jar:web/WEB-INF/lib/commons-collections-3.1.jar:web/WEB-INF/lib/commons-digester-1.6.jar:web/WEB-INF/lib/commons-el-1.0.jar:web/WEB-INF/lib/commons-lang-2.1.jar:web/WEB-INF/lib/jstl.jar:web/WEB-INF/lib/myfaces-api-1.1.4.jar:web/WEB-INF/lib/myfaces-impl-1.1.4.jar:web/WEB-INF/lib/standard.jar:web/WEB-INF/lib/tomahawk-1.1.3.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:lib/asm-attrs.jar:lib/asm.jar:lib/cglib-2.1.3.jar:lib/commons-fileupload.jar:lib/commons-lang-2.0.jar:lib/commons-logging.jar:lib/commons-validator.jar:lib/dom4j-1.6.1.jar:lib/ehcache-1.1.jar:lib/hibernate3.jar:lib/jaxen-full.jar:lib/jdbc2_0-stdext.jar:lib/jdom.jar:lib/jta.jar:lib/log4j-1.2.11.jar:lib/roller-business.jar:lib/roller-web.jar:lib/rome-0.8.jar:lib/rome-fetcher-0.8.jar:lib/saxpath.jar:lib/servlet-api.jar:lib/velocity-1.4.jar:lib/velocity-dep-1.4.jar:lib/activation.jar:lib/mail.jar:build/lib/roller-planet-business.jar
 :lib/struts2/commons-collections-3.1.jar:lib/struts2/commons-logging-1.0.4.jar:lib/struts2/freemarker-2.3.4.jar:lib/struts2/ognl-2.6.7.jar:lib/struts2/spring-aop-1.2.8.jar:lib/struts2/spring-beans-1.2.8.jar:lib/struts2/spring-context-1.2.8.jar:lib/struts2/spring-core-1.2.8.jar:lib/struts2/spring-web-1.2.8.jar:lib/struts2/struts2-api-2.0.1.jar:lib/struts2/struts2-core-2.0.1.jar:lib/struts2/xwork-2.0-beta-1.jar</classpath>
                 <source-level>1.4</source-level>
             </compilation-unit>
             <compilation-unit>