incubator-olio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r887393 - in /incubator/olio/dist: README build.xml release.template
Date Fri, 04 Dec 2009 22:27:49 GMT
Author: shanti
Date: Fri Dec  4 22:27:49 2009
New Revision: 887393

URL: http://svn.apache.org/viewvc?rev=887393&view=rev
Log:
Updated build.xml to not package rails rspec, rspec-rails plugins. 
Added info on how to build java webapp in README.
Added AL to release.template

Modified:
    incubator/olio/dist/README
    incubator/olio/dist/build.xml
    incubator/olio/dist/release.template

Modified: incubator/olio/dist/README
URL: http://svn.apache.org/viewvc/incubator/olio/dist/README?rev=887393&r1=887392&r2=887393&view=diff
==============================================================================
--- incubator/olio/dist/README (original)
+++ incubator/olio/dist/README Fri Dec  4 22:27:49 2009
@@ -4,6 +4,9 @@
 Set the property 'build.release' to 'true' if you're generating a release without a time-stamp.
 Create release notes if required. Use the format RELEASE-NOTES-<type>-<version>.txt.
 All release notes should reside in the 'releasenotes' directory.
+The Java app needs to be built by going to 
+webapp/java/trunk/ws/apps/webapp and running ant in that directory.
+
 To build all releases, simply type 'ant'.
 The releases will be built in the 'nightly' directory.
 DO NOT check in the 'nightly' directory into the repository.

Modified: incubator/olio/dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/olio/dist/build.xml?rev=887393&r1=887392&r2=887393&view=diff
==============================================================================
--- incubator/olio/dist/build.xml (original)
+++ incubator/olio/dist/build.xml Fri Dec  4 22:27:49 2009
@@ -135,7 +135,7 @@
             <tarfileset dir="${geocoder.dir}/dist" prefix="${rails.pkg.name}"
                         includes="geocoder.war"/>
             <tarfileset dir="${rails.app.dir}" prefix="${rails.pkg.name}/oliorails"
-                        excludes="build.xml"/>
+                        excludes="vendor/plugins/rspec/**,vendor/plugins/rspec-rails/**"/>
         </tar>
         <zip destfile="${kit.dir}/${rails.pkg.name}.zip">
             <zipfileset dir="stage" prefix="${rails.pkg.name}" includes="release,LICENSE,NOTICE"/>
@@ -148,7 +148,7 @@
             <zipfileset dir="${geocoder.dir}/dist" prefix="${rails.pkg.name}"
                         includes="geocoder.war"/>
             <zipfileset dir="${rails.app.dir}" prefix="${rails.pkg.name}/oliorails"
-                        excludes="build.xml"/>
+                        excludes="vendor/plugins/rspec/**,vendor/plugins/rspec-rails/**"/>
         </zip>
     </target>
 
@@ -240,6 +240,8 @@
                 <exclude name="**/build/**"/>
                 <exclude name="geocoder/dist/**"/>
                 <exclude name="**/build.properties"/>
+                <exclude name="webapp/rails/trunk/vendor/plugins/rspec/**"/>
+                <exclude name="webapp/rails/trunk/vendor/plugins/rspec-rails/**"/>
             </tarfileset>
         </tar>
         <zip destfile="${kit.dir}/${rails.src.name}.zip">
@@ -257,6 +259,8 @@
                 <exclude name="**/build/**"/>
                 <exclude name="geocoder/dist/**"/>
                 <exclude name="**/build.properties"/>
+                <exclude name="webapp/rails/trunk/vendor/plugins/rspec/**"/>
+                <exclude name="webapp/rails/trunk/vendor/plugins/rspec-rails/**"/>
             </zipfileset>
         </zip>
     </target>
@@ -295,7 +299,7 @@
                 <include name="dist/releasenotes/${java.relnotes}"/>
                 <include name="docs/**"/>
                 <include name="geocoder/**"/>
-                <include name="webapp/javap/trunk/**"/>
+                <include name="webapp/java/trunk/**"/>
                 <include name="workload/java/trunk/**"/>
                 <exclude name="dist/nightly/**"/>
                 <exclude name="dist/release/**"/>

Modified: incubator/olio/dist/release.template
URL: http://svn.apache.org/viewvc/incubator/olio/dist/release.template?rev=887393&r1=887392&r2=887393&view=diff
==============================================================================
--- incubator/olio/dist/release.template (original)
+++ incubator/olio/dist/release.template Fri Dec  4 22:27:49 2009
@@ -1 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 Olio @@olio.version@@ b@@build.date@@



Mime
View raw message