Author: craigmcc
Date: Thu Jan  5 22:57:59 2006
New Revision: 366441

URL: http://svn.apache.org/viewcvs?rev=366441&view=rev
Log:
Split out the org.apache.shale.remoting package into its own JAR file
(shale-remoting.jar), because it is completely self contained and not
reliant on other Shale functionality.  The only dependencies are JDK,
JSF, commons logging, and Servlet.

Added:
    
struts/shale/trunk/core-library/src/java/org/apache/shale/remoting/faces-config.xml
   (with props)
Modified:
    struts/shale/trunk/core-library/build.xml
    struts/shale/trunk/core-library/src/conf/faces-config.xml
    struts/shale/trunk/use-cases/build.xml

Modified: struts/shale/trunk/core-library/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=366441&r1=366440&r2=366441&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Thu Jan  5 22:57:59 2006
@@ -195,6 +195,13 @@
         <filter token="version" value="${project.version}"/>
       </filterset>
     </copy>
+    <copy   tofile="${build.home}/conf/MANIFEST.MF-remoting"
+              file="src/conf/MANIFEST.MF">
+      <filterset>
+        <filter token="package" value="${project.package}.remoting"/>
+        <filter token="version" value="${project.version}"/>
+      </filterset>
+    </copy>
     <copy   tofile="${build.home}/conf/MANIFEST.MF-spring"
               file="src/conf/MANIFEST.MF">
       <filterset>
@@ -276,8 +283,24 @@
     <jar       jarfile="${build.home}/lib/shale-core.jar"
                basedir="${build.home}/classes"
               manifest="${build.home}/conf/MANIFEST.MF-core"
-              excludes="org/apache/shale/spring/** org/apache/shale/tiles/** 
**/package.html"/>
+              excludes="org/apache/shale/remoting/** 
org/apache/shale/spring/** org/apache/shale/tiles/** **/package.html"/>
+
+  </target>
+
 
+  <target        name="library-remoting" depends="compile"
+          description="Package Remoting support library">
+    <mkdir        dir="${build.home}/shale-remoting"/>
+    <mkdir        dir="${build.home}/shale-remoting/META-INF"/>
+    <copy       todir="${build.home}/shale-remoting/META-INF"
+                 file="src/java/org/apache/shale/remoting/faces-config.xml"/>
+    <jar      jarfile="${build.home}/lib/shale-remoting.jar"
+             manifest="${build.home}/conf/MANIFEST.MF-remoting">
+      <fileset    dir="${build.home}/shale-remoting"/>
+      <fileset    dir="${build.home}/classes"
+             includes="org/apache/shale/remoting/** META-INF/*.txt"
+             excludes="**/faces-config.xml **/package.html"/>
+    </jar>
   </target>
 
 
@@ -296,6 +319,7 @@
     </jar>
   </target>
 
+
   <target        name="library-tiles" depends="compile" if="tiles.present"
           description="Package Tiles integration library">
     <mkdir        dir="${build.home}/shale-tiles"/>
@@ -312,7 +336,7 @@
   </target>
 
 
-  <target        name="library" depends="library-core, library-spring, 
library-tiles"
+  <target        name="library" depends="library-core, library-remoting, 
library-spring, library-tiles"
           description="Package all libraries"/>
 
 

Modified: struts/shale/trunk/core-library/src/conf/faces-config.xml
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/conf/faces-config.xml?rev=366441&r1=366440&r2=366441&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/conf/faces-config.xml (original)
+++ struts/shale/trunk/core-library/src/conf/faces-config.xml Thu Jan  5 
22:57:59 2006
@@ -49,9 +49,11 @@
   </application>
 
   <!-- Custom JSF PhaseListener Objects -->
+  <!-- Loaded from shale-remoting.jar now
   <lifecycle>
     
<phase-listener>org.apache.shale.remoting.faces.RemotingPhaseListener</phase-listener>
   </lifecycle>
+  -->
 
   <!-- Custom Components -->
   <component>

Added: 
struts/shale/trunk/core-library/src/java/org/apache/shale/remoting/faces-config.xml
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remoting/faces-config.xml?rev=366441&view=auto
==============================================================================
--- 
struts/shale/trunk/core-library/src/java/org/apache/shale/remoting/faces-config.xml
 (added)
+++ 
struts/shale/trunk/core-library/src/java/org/apache/shale/remoting/faces-config.xml
 Thu Jan  5 22:57:59 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd";>
+
+
+<!--
+
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed 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.
+
+ $Id$
+
+-->
+
+
+<!-- ============ SHALE REMOTING SUPPORT CONFIGURATION FILE ================ 
-->
+
+
+<faces-config>
+
+  <lifecycle>
+    <!-- Load the phase listener that provides remoting services -->
+    
<phase-listener>org.apache.shale.remoting.faces.RemotingPhaseListener</phase-listener>
+  </lifecycle>
+
+</faces-config>

Propchange: 
struts/shale/trunk/core-library/src/java/org/apache/shale/remoting/faces-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
struts/shale/trunk/core-library/src/java/org/apache/shale/remoting/faces-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/shale/trunk/use-cases/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=366441&r1=366440&r2=366441&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Thu Jan  5 22:57:59 2006
@@ -43,6 +43,8 @@
   <!-- Dependency library defaults -->
   <property name="shale-core.jar"   value="${shale.home}/lib/shale-core.jar"/>
   <property name="shale-clay.jar"   
value="${shale-clay.home}/lib/shale-clay.jar"/>
+  <property name="shale-remoting.jar"
+                                    
value="${shale.home}/lib/shale-remoting.jar"/>
   <property name="shale-spring.jar" 
value="${shale.home}/lib/shale-spring.jar"/>
   <property name="shale-test.jar"   
value="${shale-test.home}/lib/shale-test.jar"/>
 
@@ -74,6 +76,8 @@
     <pathelement location="${servlet-api.jar}"/>
     <pathelement location="${shale-core.jar}"/>
     <pathelement location="${shale-clay.jar}"/>
+    <pathelement location="${shale-remoting.jar}"/>
+    <pathelement location="${shale-spring.jar}"/>
     <pathelement location="${spring-beans.jar}"/>
     <pathelement location="${spring-context.jar}"/>
     <pathelement location="${spring-core.jar}"/>
@@ -96,6 +100,8 @@
     <pathelement location="${servlet-api.jar}"/>
     <pathelement location="${shale-core.jar}"/>
     <pathelement location="${shale-clay.jar}"/>
+    <pathelement location="${shale-remoting.jar}"/>
+    <pathelement location="${shale-spring.jar}"/>
     <pathelement location="${shale-test.jar}"/>
     <pathelement location="${spring-beans.jar}"/>
     <pathelement location="${spring-context.jar}"/>
@@ -202,6 +208,8 @@
                   file="${shale-core.jar}"/>
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
                   file="${shale-clay.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${shale-remoting.jar}"/>
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
                   file="${shale-spring.jar}"/>
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to