svn commit: r155069 - in incubator/graffito/trunk/jetspeed2-deploy: maven.xml src/assembly/jetspeed-spring.xml src/pages/graffito.psml

[cl...@apache.org]

Author: clombart
Date: Wed Feb 23 12:51:24 2005
New Revision: 155069

URL: http://svn.apache.org/viewcvs?view=rev&rev=155069
Log:
* Apply patch provided by DerShung Yang. Now it is not necessary to maintain the J2 spring config file (jetspeed-spring.xml)
* Small modification in the psml file (change the id)

Removed:
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
Modified:
    incubator/graffito/trunk/jetspeed2-deploy/maven.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml

Modified: incubator/graffito/trunk/jetspeed2-deploy/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/maven.xml?view=diff&r1=155068&r2=155069
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/maven.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/maven.xml Wed Feb 23 12:51:24 2005
@@ -13,19 +13,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
-<project default="java:jar"
-         xmlns:j="jelly:core"
-         xmlns:define="jelly:define"
-         xmlns:reactor="reactor">
-
-
-  <!-- ================================================================ -->
-  <!-- Hot Deploy for mundane everyday development under Catalina       -->
-  <!-- ================================================================ -->
-  
-  <goal name="deploy">	
-	<copy todir="${org.apache.jetspeed.deploy.war.dir}jetspeed/WEB-INF" overwrite="true">
-            <fileset dir="${maven.src.dir}" />            
-        </copy>
-  </goal>
-  </project>
\ No newline at end of file
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:util="jelly:util" xmlns:reactor="reactor">
+	<!-- ================================================================ -->
+	<!-- Hot Deploy for mundane everyday development under Catalina       -->
+	<!-- ================================================================ -->
+	<goal name="deploy">
+		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF" overwrite="true">
+			<fileset dir="${maven.src.dir}" />
+		</copy>
+		<!-- Insert Graffito's ContentServer and ContentModel into the  -->
+		<!-- jetspeed-spring.xml from a Jetspeed running application    -->
+		<util:loadText file="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/assembly/jetspeed-spring.xml" var="jetspeedSpringXml"/>
+		<j:if test="${jetspeedSpringXml.indexOf('graffito') lt 0}">
+			<replaceregexp file="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/assembly/jetspeed-spring.xml">
+				<regexp pattern="(.+PortletRegistryComponent.+)" />
+				<substitution 
+					expression="&lt;entry key=\&quot;ContentServer\&quot;&gt;&lt;ref bean=\&quot;org.apache.portals.graffito.ContentServerService\&quot;/&gt;&lt;/entry&gt;&lt;entry key=\&quot;ContentModel\&quot;&gt;&lt;ref bean=\&quot;org.apache.portals.graffito.ContentModelService\&quot;/&gt;&lt;/entry&gt;\1" 
+				/>
+			</replaceregexp>
+		</j:if>
+	</goal>
+</project>
\ No newline at end of file

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml?view=diff&r1=155068&r2=155069
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml Wed Feb 23 12:51:24 2005
@@ -7,7 +7,7 @@
     <short-title>Graffito</short-title>
     <defaults skin="orange" layout-decorator="tigris" portlet-decorator="tigris"/>
     <fragment id="gf-1" type="layout" name="jetspeed::VelocityOneColumn">
-        <fragment id="gf-2" type="portlet" name="graffito-browser::graffitoBrowser">
+        <fragment id="graffitoBrowser" type="portlet" name="graffito-browser::graffitoBrowser">
             <property name="row" value="0" layout="OneColumn"/>
             <property name="column" value="0" layout="OneColumn"/>
         </fragment>