svn commit: r1351866 [2/48] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/in...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1351866 [2/48] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/in...

erwan
Modified: ofbiz/branches/20120329_portletWidget/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/LICENSE?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/LICENSE (original)
+++ ofbiz/branches/20120329_portletWidget/LICENSE Tue Jun 19 21:36:11 2012
@@ -11,11 +11,10 @@ For additional details, see the NOTICE f
 http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz
 =========================================================================
 The following libraries are licensed under the Apache License Version 2.0:
-ofbiz/trunk/framework/base/lib/ant-launcher-1.8.3.jar
-ofbiz/trunk/framework/base/lib/ant-1.8.3.jar
-ofbiz/trunk/framework/base/lib/ant-junit-1.8.3.jar
-ofbiz/trunk/framework/base/lib/ant-trax-1.8.0.jar
-ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.8.3.jar
+ofbiz/trunk/framework/base/lib/ant-launcher-1.8.4.jar
+ofbiz/trunk/framework/base/lib/ant-1.8.4.jar
+ofbiz/trunk/framework/base/lib/ant-junit-1.8.4.jar
+ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.8.4.jar
 ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.8.1.jar
 ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar
 ofbiz/trunk/framework/base/lib/avalon-util-exception-1.0.0.jar
@@ -43,7 +42,7 @@ ofbiz/trunk/framework/base/lib/commons/c
 ofbiz/trunk/framework/base/lib/commons/commons-cli-1.0.jar
 ofbiz/trunk/framework/base/lib/commons/commons-codec-1.4.jar
 ofbiz/trunk/framework/base/lib/commons/commons-collections-3.2.jar
-ofbiz/trunk/framework/base/lib/commons/commons-compress-1.4.jar
+ofbiz/trunk/framework/base/lib/commons/commons-compress-1.4.1.jar
 ofbiz/trunk/framework/base/lib/commons/commons-digester-1.8.jar
 ofbiz/trunk/framework/base/lib/commons/commons-discovery-0.4.jar
 ofbiz/trunk/framework/base/lib/commons/commons-el-1.0.jar
@@ -76,21 +75,11 @@ ofbiz/trunk/framework/base/lib/scripting
 ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-util.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-es.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-ant.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.jasper-el.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-juli.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-ja.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-dbcp.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-juli-adapters.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-fr.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-coyote.jar
 ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-api.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar
 ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
@@ -456,7 +445,7 @@ BSD License:
 ofbiz/trunk/applications/content/lib/dom4j-1.6.1.jar
 ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar
 ofbiz/trunk/framework/base/lib/bsh-engine-modified.jar
-ofbiz/trunk/framework/base/lib/freemarker-2.3.19.jar
+ofbiz/trunk/framework/base/lib/freemarker-2.3.19-null-wildcards.jar
 ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
 ofbiz/trunk/framework/base/lib/httpunit-1.7.jar
 ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar
@@ -1229,7 +1218,7 @@ any resulting litigation.
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 MIT/X License:
-ofbiz/trunk/framework/base/lib/icu4j-4_4.jar
+ofbiz/trunk/framework/base/lib/icu4j-49_1.jar
 ofbiz/trunk/framework/base/lib/jcl-over-slf4j-1.6.4.jar
 ofbiz/trunk/framework/entity/lib/ofbiz-minerva.jar
 ofbiz/trunk/framework/base/lib/slf4j-api-1.6.4.jar

Modified: ofbiz/branches/20120329_portletWidget/OPTIONAL_LIBRARIES
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/OPTIONAL_LIBRARIES?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/OPTIONAL_LIBRARIES (original)
+++ ofbiz/branches/20120329_portletWidget/OPTIONAL_LIBRARIES Tue Jun 19 21:36:11 2012
@@ -7,69 +7,6 @@ to change to include them in the OFBiz b
 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 __________________________________________________________________________________________________________________________________________________
-
--Shark (LGPL):
-  http://www.enhydra.org/workflow/shark/
-  Current version : http://shark.objectweb.org/doc/1.1/release_notes/release_notes.html
-  framework/shark/lib:
-     js.jar
-     sharkassignment-historyrelated-1.2_1.jar
-     sharkassignment-standard-1.2_1.jar
-     sharkassignment-xpdlstraightparticipantmapping-1.2_1.jar
-     sharkauthentication-ldap-1.2_1.jar
-     sharkcaching-lru-1.2_1.jar
-     sharkclientapi-1.2_1.jar
-     sharkcommonapi-1.2_1.jar
-     sharkcorbaadmin-1.2_1.jar
-     sharkcorbaclientapi-1.2_1.jar
-     sharkcorbaserver-1.2_1.jar
-     sharkcorbawhandler-1.2_1.jar
-     sharkeventaudit-notifying-1.2_1.jar
-     sharkeventaudit-smtp-1.2_1.jar
-     sharkinternalapi-1.2_1.jar
-     sharkinteroperability-wfxml-1.2_1.jar
-     sharkkernel-standard-1.2_1.jar
-     sharklimitagent-standard-1.2_1.jar
-     sharklimitagent-timer-1.2_1.jar
-     sharklogging-standard-1.2_1.jar
-     sharkprocesslocking-memory-1.2_1.jar
-     sharkrepositorypersistence-filesystem-1.2_1.jar
-     sharkscripting-standard-1.2_1.jar
-     sharksecurity-standard-1.2_1.jar
-     sharktoolagent-standard-1.2_1.jar
-     sharkusergroup-ldap-1.2_1.jar
-     sharkutilities-common-1.2_1.jar
-     sharkutilities-map-1.2_1.jar
-     sharkutilities-misc-1.2_1.jar
-     sharkwebservice-asap-1.2_1.jar
-     sharkwebservice-asapapi-1.2_1.jar
-     sharkwebservice-asaputils-1.2_1.jar
-     sharkwebservice-wfxml-1.2_1.jar
-     sharkwebservice-wfxmlapi-1.2_1.jar
-     sharkwebservice-wfxmlutils-1.2_1.jar
-     sharkxpdl-standard-1.2_1.jar
-     wrd-1.2_1.jar
-  NOTE: these jars based on a build from version 1.2_1 may be found attached
-     in https://issues.apache.org/jira/browse/OFBIZ-552
-     For an updated version some changes to the integration code in the
-     shark component may be necessary.
-  TO BUILD: once the jars are in place you can build from the
-     ofbiz/framework/shark directory, or you can add it to the build
-     list in the ofbiz/build.xml file in the framework-builds file list.
-  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.
-  TO DEPLOY, PART 2: to get the component to load on startup, and get the webapp
-     in place and such the shark component needs to be uncommented in the
-     framework/component-load.xml file.
-
-  You may experiment online with Jawe XPDL editor:
-  http://www.enhydra.org/workflow/jawe/index.html
-  There is an example XPDL file in https://issues.apache.org/jira/browse/OFBIZ-552
-  it came from http://www.wfmc.org/standards/docs/xpdl_sample/sample%20workflow%20process.xpdl
-  For the moment Shark engine in OFBiz refuses to load it (OK in Jawe)
-
 -=- Web Presentation: ________________________________________________________________________________________________________________________________________________
 
 -JPublish/EdenLib (Apache):
@@ -169,10 +106,10 @@ on the old Undersun SVN server in the sp
 
 -Securepay
   applications/accounting/lib/cybersource:
- Base64.jar
- securepayxmlapi_obf.jar
- xercesImpl-2.4.0.jar
- xmlParserAPIs-2.4.0.jar
+  Base64.jar
+  securepayxmlapi_obf.jar
+  xercesImpl-2.4.0.jar
+  xmlParserAPIs-2.4.0.jar
   TO BUILD comment out exclude: applications/accounting/build.xml:org/ofbiz/accounting/thirdparty/securepay/**
 
 -WorldPay

Modified: ofbiz/branches/20120329_portletWidget/ant.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/ant.bat?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/ant.bat (original)
+++ ofbiz/branches/20120329_portletWidget/ant.bat Tue Jun 19 21:36:11 2012
@@ -19,5 +19,5 @@ REM # under the License.
 REM #####################################################################
 ECHO ON
 
-"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.8.3.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6
+"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.8.4.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6