svn commit: r1674482 - in /ofbiz/trunk: ./ framework/start/src/org/ofbiz/base/start/ specialpurpose/ specialpurpose/jetty/ themes/bizznesstime/ themes/bluelight/ themes/droppingcrumbs/ themes/flatgrey/ themes/multiflex/ themes/tomahawk/

Author: jleroux
Date: Sat Apr 18 11:44:52 2015
New Revision: 1674482

URL: http://svn.apache.org/r1674482
Log:
A patch from Pierre Smits "Move special purpose/jetty to attic" https://issues.apache.org/jira/browse/OFBIZ-6223

As per outcome of http://ofbiz.markmail.org/message/xoqjhbitdj5fi3bl remove special purpose/jetty from the trunk branch and add a notification to the attic document.

Removed:
    ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties
    ofbiz/trunk/specialpurpose/jetty/
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/.gitignore
    ofbiz/trunk/build.xml
    ofbiz/trunk/specialpurpose/LICENSE
    ofbiz/trunk/specialpurpose/NOTICE
    ofbiz/trunk/specialpurpose/build.xml
    ofbiz/trunk/specialpurpose/component-load.xml
    ofbiz/trunk/themes/bizznesstime/ofbiz-component.xml
    ofbiz/trunk/themes/bluelight/ofbiz-component.xml
    ofbiz/trunk/themes/droppingcrumbs/ofbiz-component.xml
    ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
    ofbiz/trunk/themes/multiflex/ofbiz-component.xml
    ofbiz/trunk/themes/tomahawk/ofbiz-component.xml

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Sat Apr 18 11:44:52 2015
@@ -124,21 +124,6 @@
     <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/>
     <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/>
     <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.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/ldap/lib/cas-server-core-3.3.jar"/>
     <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar"/>
     <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar"/>
@@ -182,7 +167,6 @@
     <classpathentry kind="src" path="specialpurpose/googlebase/src"/>
     <classpathentry kind="src" path="specialpurpose/googlecheckout/src"/>
     <classpathentry kind="src" path="specialpurpose/hhfacility/src"/>
-    <classpathentry kind="src" path="specialpurpose/jetty/src"/>
     <classpathentry kind="src" path="specialpurpose/ldap/src"/>
     <classpathentry kind="src" path="specialpurpose/oagis/src"/>
     <classpathentry kind="src" path="specialpurpose/pos/src"/>

Modified: ofbiz/trunk/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/.gitignore (original)
+++ ofbiz/trunk/.gitignore Sat Apr 18 11:44:52 2015
@@ -26,7 +26,6 @@ runtime/logs/test-results/*
 runtime/data/derby/*
 runtime/data/utilcache.*
 runtime/catalina/work/*
-runtime/jetty
 runtime/tempfiles/*
 !runtime/tempfiles/README
 runtime/indexes/products/

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sat Apr 18 11:44:52 2015
@@ -522,7 +522,6 @@ under the License.
           <fileset dir="${ofbiz.home.dir}/specialpurpose/googlecheckout/lib" includes="*.jar"/>
           <fileset dir="${ofbiz.home.dir}/specialpurpose/ldap/lib" includes="*.jar"/>
           <fileset dir="${ofbiz.home.dir}/specialpurpose/pos/lib" includes="*.jar"/>
-          <fileset dir="${ofbiz.home.dir}/specialpurpose/jetty/lib" includes="*.jar"/>
           <fileset dir="${ofbiz.home.dir}/applications/content/lib" includes="*.jar"/>
           <fileset dir="${ofbiz.home.dir}/applications/product/lib" includes="*.jar"/>
         </path>
@@ -1311,7 +1310,7 @@ under the License.
 
         <property name="sonar.sources" value="framework/base/src, framework/bi/src,
             framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src,
-            framework/example/src, framework/geronimo/src, framework/jetty/src,
+            framework/example/src, framework/geronimo/src,
             framework/minilang/src, framework/security/src, framework/service/src, framework/start/src,
             framework/testtools/src, framework/webapp/src, framework/webtools/src, framework/widget/src,
             applications/accounting/src, applications/commonext/src, applications/content/src, applications/humanres/src,

Modified: ofbiz/trunk/specialpurpose/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/LICENSE?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/LICENSE (original)
+++ ofbiz/trunk/specialpurpose/LICENSE Sat Apr 18 11:44:52 2015
@@ -1022,10 +1022,6 @@ 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.
 
@@ -1401,17 +1397,6 @@ specialpurpose/birt/lib/saaj.jar
 specialpurpose/birt/lib/Tidy.jar
 specialpurpose/birt/lib/viewservlets.jar
 specialpurpose/birt/webapp/birt/webcontent/birt/*
-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=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/NOTICE (original)
+++ ofbiz/trunk/specialpurpose/NOTICE Sat Apr 18 11:44:52 2015
@@ -12,39 +12,3 @@ 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=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/build.xml (original)
+++ ofbiz/trunk/specialpurpose/build.xml Sat Apr 18 11:44:52 2015
@@ -30,7 +30,6 @@
         googlebase/build.xml,
         googlecheckout/build.xml,
         hhfacility/build.xml,
-        jetty/build.xml,
         ldap/build.xml,
         lucene/build.xml,
         oagis/build.xml,

Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Sat Apr 18 11:44:52 2015
@@ -40,5 +40,4 @@ under the License.
     <load-component component-location="bi"/>
     <load-component component-location="example"/>
     <load-component component-location="exampleext"/>
-    <!-- <load-component component-location="jetty"/> -->
 </component-loader>

Modified: ofbiz/trunk/themes/bizznesstime/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/ofbiz-component.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/ofbiz-component.xml (original)
+++ ofbiz/trunk/themes/bizznesstime/ofbiz-component.xml Sat Apr 18 11:44:52 2015
@@ -27,7 +27,7 @@ under the License.
     <!-- entity resources: model(s), eca(s), group, and data definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BizznessTimeThemeData.xml"/>
 
-    <!-- web applications; will be mounted when using the embedded Jetty container -->
+    <!-- web applications -->
     <webapp name="bizznesstime"
         title="bizznesstime"
         menu-name="secondary"

Modified: ofbiz/trunk/themes/bluelight/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/ofbiz-component.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/ofbiz-component.xml (original)
+++ ofbiz/trunk/themes/bluelight/ofbiz-component.xml Sat Apr 18 11:44:52 2015
@@ -27,7 +27,7 @@ under the License.
     <!-- entity resources: model(s), eca(s), group, and data definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BlueLightThemeData.xml"/>
 
-    <!-- web applications; will be mounted when using the embedded Jetty container -->
+    <!-- web applications -->
     <webapp name="bluelight"
         title="bluelight"
         menu-name="secondary"

Modified: ofbiz/trunk/themes/droppingcrumbs/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/ofbiz-component.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/ofbiz-component.xml (original)
+++ ofbiz/trunk/themes/droppingcrumbs/ofbiz-component.xml Sat Apr 18 11:44:52 2015
@@ -27,7 +27,7 @@ under the License.
     <!-- entity resources: model(s), eca(s), group, and data definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/DroppingCrumbsThemeData.xml"/>
 
-    <!-- web applications; will be mounted when using the embedded Jetty container -->
+    <!-- web applications -->
     <webapp name="droppingcrumbs"
         title="droppingcrumbs"
         menu-name="secondary"

Modified: ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/ofbiz-component.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/ofbiz-component.xml (original)
+++ ofbiz/trunk/themes/flatgrey/ofbiz-component.xml Sat Apr 18 11:44:52 2015
@@ -27,7 +27,7 @@ under the License.
     <!-- entity resources: model(s), eca(s), group, and data definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/FlatGreyThemeData.xml"/>
 
-    <!-- web applications; will be mounted when using the embedded Jetty container -->
+    <!-- web applications -->
     <webapp name="flatgrey"
         title="flatgrey"
         menu-name="secondary"

Modified: ofbiz/trunk/themes/multiflex/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/ofbiz-component.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/themes/multiflex/ofbiz-component.xml (original)
+++ ofbiz/trunk/themes/multiflex/ofbiz-component.xml Sat Apr 18 11:44:52 2015
@@ -27,7 +27,7 @@ under the License.
     <!-- entity resources: model(s), eca(s), group, and data definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MultiflexThemeData.xml"/>
 
-    <!-- web applications; will be mounted when using the embedded Jetty container -->
+    <!-- web applications -->
     <webapp name="multiflex"
         title="multiflex"
         menu-name="secondary"

Modified: ofbiz/trunk/themes/tomahawk/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/ofbiz-component.xml?rev=1674482&r1=1674481&r2=1674482&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/ofbiz-component.xml (original)
+++ ofbiz/trunk/themes/tomahawk/ofbiz-component.xml Sat Apr 18 11:44:52 2015
@@ -27,7 +27,7 @@ under the License.
     <!-- entity resources: model(s), eca(s), group, and data definitions -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/TomahawkThemeData.xml"/>
 
-    <!-- web applications; will be mounted when using the embedded Jetty container -->
+    <!-- web applications -->
     <webapp name="tomahawk"
         title="tomahawk"
         menu-name="secondary"