[OFBiz] SVN: r7726 - in trunk: . applications/accounting applications/accounting/lib specialized/libraries

jonesde@svn.ofbiz.org jonesde at svn.ofbiz.org
Thu Jun 1 00:46:49 CDT 2006 

Author: jonesde
Date: 2006-06-01 00:46:38 -0500 (Thu, 01 Jun 2006)
New Revision: 7726

Added:
   trunk/applications/accounting/lib/README
   trunk/specialized/libraries/cybersource/
   trunk/specialized/libraries/worldpay/
Removed:
   trunk/applications/accounting/lib/cybersource/
   trunk/applications/accounting/lib/worldpay/
Modified:
   trunk/.classpath
   trunk/OPTIONAL_LIBRARIES
   trunk/applications/accounting/build.xml
Log:
Moved worldpay and cybersource libraries to the specialied/libraries component because of licensing issues; updated the OPTIONAL_LIBRARIES file, the Eclipse classpath file, build.xml file, etc

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2006-05-31 22:51:33 UTC (rev 7725)
+++ trunk/.classpath	2006-06-01 05:46:38 UTC (rev 7726)
@@ -4,7 +4,7 @@
 	<classpathentry excluding="org/ofbiz/base/util/OfbizJsBsfEngine.java" kind="src" path="base/src/base"/>
 	<classpathentry kind="src" path="framework/testtools/src"/>
 	<classpathentry kind="src" path="framework/geronimo/src"/>
-	<classpathentry excluding="org/ofbiz/accounting/thirdparty/clearcommerce/**|org/ofbiz/accounting/thirdparty/verisign/**" kind="src" path="applications/accounting/src"/>
+	<classpathentry excluding="org/ofbiz/accounting/thirdparty/clearcommerce/**|org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**" kind="src" path="applications/accounting/src"/>
 	<classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/>
 	<classpathentry kind="src" path="applications/ecommerce/src"/>
 	<classpathentry kind="src" path="applications/manufacturing/src"/>
@@ -59,7 +59,6 @@
 	<classpathentry kind="lib" path="base/lib/commons/commons-codec.jar"/>
 	<classpathentry kind="lib" path="base/lib/jakarta-regexp.jar"/>
 	<classpathentry kind="lib" path="base/lib/httpunit.jar"/>
-	<classpathentry kind="lib" path="framework/webapp/lib/xom-1.0d25.jar"/>
 	<classpathentry kind="lib" path="framework/webapp/lib/velocity-dep-1.3.jar"/>
 	<classpathentry kind="lib" path="framework/webapp/lib/velocity-1.3.jar"/>
 	<classpathentry kind="lib" path="framework/webapp/lib/MinML2.jar"/>
@@ -82,10 +81,6 @@
 	<classpathentry kind="lib" path="applications/pos/lib/jcl.jar"/>
 	<classpathentry kind="lib" path="applications/content/lib/poi.jar"/>
 	<classpathentry kind="lib" path="applications/content/lib/lucene.jar"/>
-	<classpathentry kind="lib" path="applications/accounting/lib/worldpay/select.jar"/>
-	<classpathentry kind="lib" path="applications/accounting/lib/worldpay/cryptix.jar"/>
-	<classpathentry kind="lib" path="applications/accounting/lib/cybersource/cybssecurity.jar"/>
-	<classpathentry kind="lib" path="applications/accounting/lib/cybersource/cybsclients.jar"/>
 	<classpathentry kind="lib" path="base/lib/Tidy.jar"/>
 	<classpathentry kind="lib" path="framework/catalina/lib/tomcat-util.jar"/>
 	<classpathentry kind="lib" path="framework/catalina/lib/tomcat-http.jar"/>

Modified: trunk/OPTIONAL_LIBRARIES
===================================================================
--- trunk/OPTIONAL_LIBRARIES	2006-05-31 22:51:33 UTC (rev 7725)
+++ trunk/OPTIONAL_LIBRARIES	2006-06-01 05:46:38 UTC (rev 7726)
@@ -3,7 +3,7 @@
 
 NOTE: While these aren't included in the main SVN repository they are available on the old Undersun SVN server in the specialized/libraries component directory.
 
--=-Workflow
+-=- Workflow
 
 -Shark (LGPL):
   http://www.enhydra.org/workflow/shark/
@@ -47,13 +47,13 @@
   TO DEPLOY: once the build is done the Shark container must be setup in the ofbiz-containers.xml
     file or other containers file being used. The shark-container container should be un-commented.
 
--=-Scripting:
+-=- Scripting:
 
 -JavaScript/Rhino (NPL 1.1):
   http://www.mozilla.org/js
   TO BUILD comment out exclude: base/build.xml:org/ofbiz/base/util/OfbizJsBsfEngine.java
 
--=-Reporting:
+-=- Reporting:
 
 -JasperReports (LGPL):
   http://sourceforge.net/projects/jasperreports
@@ -62,6 +62,7 @@
     applications/content/build.xml:org/ofbiz/content/report/JREntityListIteratorDataSource.java,org/ofbiz/content/report/JRMapCollectionDataSource.java
 
 -=- POS
+
 -GTK Swing (LGPL):
   http://sourceforge.net/projects/gtkswing/
   TO DEPLOY: base/config/pos-containers.xml:org.gtk.java.swing.plaf.gtk.GtkLookAndFeel for look and feel  
@@ -79,6 +80,7 @@
   
 
 -=- Office (Word, etc) File Handling
+
 -OpenOffice UNO (LGPL)
   http://udk.openoffice.org/
   applications/content/lib/uno:
@@ -94,6 +96,33 @@
     jut.jar
     officebean.jar
     ridl.jar
-    unoil.jar    
+    unoil.jar
   TO BUILD comment out exclude: applications/content/build.xml:org/ofbiz/content/openoffice/*
 
+-=- Accounting: Payment Processing
+
+-CyberSource
+  applications/accounting/lib/cybersource:
+    cybsclients.jar
+    cybssecurity.jar
+  TO BUILD comment out exclude: applications/accounting/build.xml:org/ofbiz/accounting/thirdparty/cybersource/**
+
+-WorldPay
+  applications/accounting/lib/worldpay:
+    config
+    config/currency.properties
+    config/keystore
+    config/keystore/wcc
+    config/keystore/wcc/public-1.key
+    config/keystore/wcc/revision
+    cryptix-lib
+    cryptix-lib/Cryptix.properties
+    cryptix.jar
+    ijce-lib
+    ijce-lib/IJCE.properties
+    ijce-lib/java.security.fallback
+    ijce-lib/TargetHelp.html
+    readme.txt
+    select.jar
+    select.properties
+  TO BUILD comment out exclude: applications/accounting/build.xml:org/ofbiz/accounting/thirdparty/worldpay/**

Modified: trunk/applications/accounting/build.xml
===================================================================
--- trunk/applications/accounting/build.xml	2006-05-31 22:51:33 UTC (rev 7725)
+++ trunk/applications/accounting/build.xml	2006-06-01 05:46:38 UTC (rev 7726)
@@ -60,8 +60,8 @@
             <fileset dir="../product/build/lib" includes="*.jar"/>
             <fileset dir="../marketing/build/lib" includes="*.jar"/>
             <fileset dir="../order/build/lib" includes="*.jar"/>
-            <fileset dir="lib/worldpay" includes="*.jar"/>
-            <fileset dir="lib/cybersource" includes="*.jar"/>
+            <!-- <fileset dir="lib/worldpay" includes="*.jar"/> -->
+            <!-- <fileset dir="lib/cybersource" includes="*.jar"/> -->
             <fileset dir="lib" includes="*.jar"/>
         </path>
     </target>
@@ -103,6 +103,8 @@
             <src path="${src.dir}"/>
             <!-- exclude the payment processor packages; comment this out to not exclude if you have libs -->
             <exclude name="org/ofbiz/accounting/thirdparty/verisign/**"/>
+            <exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/>
+            <exclude name="org/ofbiz/accounting/thirdparty/worldpay/**"/>
         </javac>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">

Added: trunk/applications/accounting/lib/README
===================================================================
--- trunk/applications/accounting/lib/README	2006-05-31 22:51:33 UTC (rev 7725)
+++ trunk/applications/accounting/lib/README	2006-06-01 05:46:38 UTC (rev 7726)
@@ -0,0 +1,3 @@
+To use the cybersource or worldpay libraries you can copy them to this directory.
+
+See the ofbiz/OPTIONAL_LIBRARIES file for more information.


Property changes on: trunk/applications/accounting/lib/README
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Copied: trunk/specialized/libraries/cybersource (from rev 7725, trunk/applications/accounting/lib/cybersource)

Copied: trunk/specialized/libraries/worldpay (from rev 7725, trunk/applications/accounting/lib/worldpay)

More information about the Svn mailing list