svn commit: r1465283 - in /ofbiz/trunk: ./ framework/ framework/base/dtd/ framework/jetty/ specialpurpose/ specialpurpose/jetty/
Locked
 
|
Author: jacopoc
Date: Sat Apr 6 18:04:11 2013 New Revision: 1465283 URL: http://svn.apache.org/r1465283 Log: Moved Jetty component from framework to specialpurpose Added: ofbiz/trunk/specialpurpose/jetty/ - copied from r1465275, ofbiz/trunk/framework/jetty/ Removed: ofbiz/trunk/framework/jetty/ Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/NOTICE ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd ofbiz/trunk/framework/build.xml ofbiz/trunk/framework/component-load.xml ofbiz/trunk/specialpurpose/LICENSE ofbiz/trunk/specialpurpose/NOTICE ofbiz/trunk/specialpurpose/build.xml ofbiz/trunk/specialpurpose/component-load.xml ofbiz/trunk/specialpurpose/jetty/build.xml ofbiz/trunk/specialpurpose/jetty/ofbiz-component.xml Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Sat Apr 6 18:04:11 2013 @@ -116,21 +116,21 @@ <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-http-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-io-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-security-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-server-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-servlet-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-webapp-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-xml-8.1.2.v20120308.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/org.eclipse.jdt.core-3.7.1.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-continuation-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-http-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-io-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-security-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-server-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-servlet-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-util-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-webapp-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-xml-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar"/> + <classpathentry kind="lib" path="specialpurpose/jetty/lib/org.eclipse.jdt.core-3.7.1.jar"/> <classpathentry kind="lib" path="specialpurpose/birt/lib/axis-1.4.jar"/> <classpathentry kind="lib" path="specialpurpose/birt/lib/axis-ant-1.4.jar"/> <classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.jar"/> @@ -183,7 +183,7 @@ <classpathentry kind="src" path="framework/entity/src"/> <classpathentry kind="src" path="framework/entityext/src"/> <classpathentry kind="src" path="framework/geronimo/src"/> - <classpathentry kind="src" path="framework/jetty/src"/> + <classpathentry kind="src" path="specialpurpose/jetty/src"/> <classpathentry kind="src" path="framework/minilang/src"/> <classpathentry kind="src" path="framework/security/src"/> <classpathentry kind="src" path="framework/service/src"/> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Sat Apr 6 18:04:11 2013 @@ -1904,10 +1904,6 @@ The following library distributed with A COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL): framework/base/lib/juel-2.1.1.jar (contains the javax.el package) framework/base/lib/mail-1.4.jar -framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar -framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar -framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar -framework/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar ========================================================================= COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1. @@ -2200,17 +2196,6 @@ of California, with venue lying in Santa The following libraries distributed with Apache OFBiz are licensed under the Eclipse Public License - v 1.0: framework/catalina/lib/ecj-4.2.1.jar -framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar -framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar -framework/jetty/lib/jetty-http-8.1.2.v20120308.jar -framework/jetty/lib/jetty-io-8.1.2.v20120308.jar -framework/jetty/lib/jetty-security-8.1.2.v20120308.jar -framework/jetty/lib/jetty-server-8.1.2.v20120308.jar -framework/jetty/lib/jetty-servlet-8.1.2.v20120308.jar -framework/jetty/lib/jetty-util-8.1.2.v20120308.jar -framework/jetty/lib/jetty-webapp-8.1.2.v20120308.jar -framework/jetty/lib/jetty-xml-8.1.2.v20120308.jar -framework/jetty/lib/org.eclipse.jdt.core-3.7.1.jar ========================================================================= Eclipse Public License - v 1.0 Modified: ofbiz/trunk/NOTICE URL: http://svn.apache.org/viewvc/ofbiz/trunk/NOTICE?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/NOTICE (original) +++ ofbiz/trunk/NOTICE Sat Apr 6 18:04:11 2013 @@ -221,42 +221,6 @@ This product includes software developed (http://jdbm.sourceforge.net/). ========================================================================= -== Jetty Notice == -========================================================================= - -============================================================== - Jetty Web Container - Copyright 1995-2006 Mort Bay Consulting Pty Ltd -============================================================== - -The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd -unless otherwise noted. It is licensed under the apache 2.0 -license. - -The javax.servlet package used by Jetty is copyright -Sun Microsystems, Inc and Apache Software Foundation. It is -distributed under the Common Development and Distribution License. -You can obtain a copy of the license at -https://glassfish.dev.java.net/public/CDDLv1.0.html. - -The UnixCrypt.java code ~Implements the one way cryptography used by -Unix systems for simple password protection. Copyright 1996 Aki Yoshida, -modified April 2001 by Iris Van den Broeke, Daniel Deville. -Permission to use, copy, modify and distribute UnixCrypt -for non-commercial or commercial purposes and without fee is -granted provided that the copyright notice appears in all copies. - -The default JSP implementation is provided by the Glassfish JSP engine -from project Glassfish http://glassfish.dev.java.net. Copyright 2005 -Sun Microsystems, Inc. and portions Copyright Apache Software Foundation. - -Some portions of the code are Copyright: - 2006 Tim Vernum - 1999 Jason Gilbert. - -The jboss integration module contains some LGPL code. - -========================================================================= == MX4J Notice == ========================================================================= Modified: ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd (original) +++ ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd Sat Apr 6 18:04:11 2013 @@ -58,30 +58,3 @@ under the License. </xs:sequence> </xs:complexType> </xs:schema> -<!-- - - Container properties are relative to the implementation class for details - of which properties are available see the docs on the class defined. - - Example: - - <ofbiz-containers> - <container name="jetty-container" class="org.ofbiz.base.container.JettyContainer"> - <property name="default-listener"> - <property name="type" value="default"/> - <property name="host" value="0.0.0.0"/> - <property name="port" value="8080"/> - <property name="min-threads" value="5"/> - <property name="max-threads" value="250"/> - <property name="max-idle-time" value="30000"/> - <property name="max-read-time" value="60000"/> - </property> - </container> - <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"> - <property name="entity" value="${ofbiz.home}/framework/entity/component.xml"/> - <property name="service" value="${ofbiz.home}/framework/service/component.xml"/> - <property name="party" value="${ofbiz.home}/applications/party/component.xml"/> - </container> - </ofbiz-containers> - ---> Modified: ofbiz/trunk/framework/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/framework/build.xml (original) +++ ofbiz/trunk/framework/build.xml Sat Apr 6 18:04:11 2013 @@ -24,7 +24,7 @@ under the License. <filelist id="framework-builds" dir="." files="start/build.xml,base/build.xml,sql/build.xml, entity/build.xml,geronimo/build.xml, - catalina/build.xml,jetty/build.xml, + catalina/build.xml, security/build.xml,service/build.xml,entityext/build.xml, bi/build.xml,minilang/build.xml, webapp/build.xml,widget/build.xml, Modified: ofbiz/trunk/framework/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/framework/component-load.xml (original) +++ ofbiz/trunk/framework/component-load.xml Sat Apr 6 18:04:11 2013 @@ -29,7 +29,6 @@ under the License. <load-component component-location="minilang"/> <load-component component-location="common"/> <load-component component-location="service"/> - <!-- <load-component component-location="jetty"/> --> <load-component component-location="catalina"/> <load-component component-location="entityext"/> <load-component component-location="bi"/> Modified: ofbiz/trunk/specialpurpose/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/LICENSE?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/LICENSE (original) +++ ofbiz/trunk/specialpurpose/LICENSE Sat Apr 6 18:04:11 2013 @@ -1013,6 +1013,10 @@ specialpurpose/ebaystore/lib/attributes. specialpurpose/ebaystore/lib/ebaysdkcore.jar specialpurpose/ebaystore/lib/helper.jar specialpurpose/ebaystore/lib/ebaycalls.jar +specialpurpose/jetty/lib/com.sun.el-2.2.0.v201108011116.jar +specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar +specialpurpose/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar +specialpurpose/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar ========================================================================= COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1. @@ -1387,6 +1391,17 @@ specialpurpose/birt/lib/org.w3c.dom.svg_ specialpurpose/birt/lib/saaj.jar specialpurpose/birt/lib/Tidy.jar specialpurpose/birt/lib/viewservlets.jar +specialpurpose/jetty/lib/jetty-ajp-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-continuation-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-http-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-io-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-security-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-server-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-servlet-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-util-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-webapp-8.1.2.v20120308.jar +specialpurpose/jetty/lib/jetty-xml-8.1.2.v20120308.jar +specialpurpose/jetty/lib/org.eclipse.jdt.core-3.7.1.jar ========================================================================= Eclipse Public License - v 1.0 Modified: ofbiz/trunk/specialpurpose/NOTICE URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/NOTICE?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/NOTICE (original) +++ ofbiz/trunk/specialpurpose/NOTICE Sat Apr 6 18:04:11 2013 @@ -12,3 +12,39 @@ Copyright 2001-2011 The Apache Software This product includes software developed by The Apache Software Foundation (http://www.apache.org/). + +========================================================================= +== Jetty Notice == +========================================================================= + +============================================================== + Jetty Web Container + Copyright 1995-2006 Mort Bay Consulting Pty Ltd +============================================================== + +The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd +unless otherwise noted. It is licensed under the apache 2.0 +license. + +The javax.servlet package used by Jetty is copyright +Sun Microsystems, Inc and Apache Software Foundation. It is +distributed under the Common Development and Distribution License. +You can obtain a copy of the license at +https://glassfish.dev.java.net/public/CDDLv1.0.html. + +The UnixCrypt.java code ~Implements the one way cryptography used by +Unix systems for simple password protection. Copyright 1996 Aki Yoshida, +modified April 2001 by Iris Van den Broeke, Daniel Deville. +Permission to use, copy, modify and distribute UnixCrypt +for non-commercial or commercial purposes and without fee is +granted provided that the copyright notice appears in all copies. + +The default JSP implementation is provided by the Glassfish JSP engine +from project Glassfish http://glassfish.dev.java.net. Copyright 2005 +Sun Microsystems, Inc. and portions Copyright Apache Software Foundation. + +Some portions of the code are Copyright: + 2006 Tim Vernum + 1999 Jason Gilbert. + +The jboss integration module contains some LGPL code. Modified: ofbiz/trunk/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/build.xml (original) +++ ofbiz/trunk/specialpurpose/build.xml Sat Apr 6 18:04:11 2013 @@ -23,6 +23,7 @@ <filelist id="specialpurpose-builds" dir="." files=" appserver/build.xml, + jetty/build.xml, ecommerce/build.xml, pos/build.xml, hhfacility/build.xml, Modified: ofbiz/trunk/specialpurpose/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1465283&r1=1465282&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/component-load.xml (original) +++ ofbiz/trunk/specialpurpose/component-load.xml Sat Apr 6 18:04:11 2013 @@ -40,4 +40,5 @@ under the License. <load-component component-location="birt"/> <load-component component-location="example"/> <load-component component-location="exampleext"/> + <!-- <load-component component-location="jetty"/> --> </component-loader> Modified: ofbiz/trunk/specialpurpose/jetty/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/jetty/build.xml?rev=1465283&r1=1465275&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/jetty/build.xml (original) +++ ofbiz/trunk/specialpurpose/jetty/build.xml Sat Apr 6 18:04:11 2013 @@ -31,10 +31,10 @@ under the License. <path id="local.class.path"> <fileset dir="${lib.dir}" includes="*.jar"/> - <fileset dir="../base/lib" includes="*.jar"/> - <fileset dir="../base/lib/commons" includes="*.jar"/> - <fileset dir="../base/build/lib" includes="*.jar"/> - <fileset dir="../entity/lib" includes="*.jar"/> - <fileset dir="../entity/build/lib" includes="*.jar"/> + <fileset dir="../../framework/base/lib" includes="*.jar"/> + <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> + <fileset dir="../../framework/base/build/lib" includes="*.jar"/> + <fileset dir="../../framework/entity/lib" includes="*.jar"/> + <fileset dir="../../framework/entity/build/lib" includes="*.jar"/> </path> </project> Modified: ofbiz/trunk/specialpurpose/jetty/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/jetty/ofbiz-component.xml?rev=1465283&r1=1465275&r2=1465283&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/jetty/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/jetty/ofbiz-component.xml Sat Apr 6 18:04:11 2013 @@ -18,7 +18,7 @@ specific language governing permissions under the License. --> -<ofbiz-component name="jetty" +<ofbiz-component name="jetty" enabled="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> <resource-loader name="main" type="component"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |