From graffito-commits-return-80-apmail-incubator-graffito-commits-archive=www.apache.org@incubator.apache.org Wed Feb 23 20:51:30 2005
Return-Path: <graffito-commits-return-80-apmail-incubator-graffito-commits-archive=www.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-graffito-commits-archive@www.apache.org
Received: (qmail 51025 invoked from network); 23 Feb 2005 20:51:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 23 Feb 2005 20:51:30 -0000
Received: (qmail 64513 invoked by uid 500); 23 Feb 2005 20:51:30 -0000
Mailing-List: contact graffito-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:graffito-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:graffito-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:graffito-commits@incubator.apache.org>
List-Id: <graffito-commits.incubator.apache.org>
Reply-To: graffito-dev@incubator.apache.org
Delivered-To: mailing list graffito-commits@incubator.apache.org
Received: (qmail 64500 invoked by uid 500); 23 Feb 2005 20:51:30 -0000
Delivered-To: apmail-incubator-graffito-cvs@incubator.apache.org
Received: (qmail 64494 invoked by uid 99); 23 Feb 2005 20:51:30 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 23 Feb 2005 12:51:29 -0800
Received: (qmail 50937 invoked by uid 65534); 23 Feb 2005 20:51:27 -0000
Message-ID: <20050223205127.50936.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Wed, 23 Feb 2005 20:51:27 -0000
Subject: svn commit: r155069 - in incubator/graffito/trunk/jetspeed2-deploy:
 maven.xml src/assembly/jetspeed-spring.xml src/pages/graffito.psml
To: graffito-cvs@incubator.apache.org
From: clombart@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155069
Log:
* Apply patch provided by DerShung Yang. Now it is not necessary to maintai=
n 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-deplo=
y/maven.xml?view=3Ddiff&r1=3D155068&r2=3D155069
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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=3D"java:jar"
-         xmlns:j=3D"jelly:core"
-         xmlns:define=3D"jelly:define"
-         xmlns:reactor=3D"reactor">
-
-
-  <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-  <!-- Hot Deploy for mundane everyday development under Catalina       --=
>
-  <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
- =20
-  <goal name=3D"deploy">=09
-	<copy todir=3D"${org.apache.jetspeed.deploy.war.dir}jetspeed/WEB-INF" ove=
rwrite=3D"true">
-            <fileset dir=3D"${maven.src.dir}" />           =20
-        </copy>
-  </goal>
-  </project>
\ No newline at end of file
+<project default=3D"java:jar" xmlns:j=3D"jelly:core" xmlns:define=3D"jelly=
:define" xmlns:util=3D"jelly:util" xmlns:reactor=3D"reactor">
+	<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+	<!-- Hot Deploy for mundane everyday development under Catalina       -->
+	<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+	<goal name=3D"deploy">
+		<copy todir=3D"${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF" o=
verwrite=3D"true">
+			<fileset dir=3D"${maven.src.dir}" />
+		</copy>
+		<!-- Insert Graffito's ContentServer and ContentModel into the  -->
+		<!-- jetspeed-spring.xml from a Jetspeed running application    -->
+		<util:loadText file=3D"${org.apache.jetspeed.deploy.war.dir}/jetspeed/WE=
B-INF/assembly/jetspeed-spring.xml" var=3D"jetspeedSpringXml"/>
+		<j:if test=3D"${jetspeedSpringXml.indexOf('graffito') lt 0}">
+			<replaceregexp file=3D"${org.apache.jetspeed.deploy.war.dir}/jetspeed/W=
EB-INF/assembly/jetspeed-spring.xml">
+				<regexp pattern=3D"(.+PortletRegistryComponent.+)" />
+				<substitution=20
+					expression=3D"&lt;entry key=3D\&quot;ContentServer\&quot;&gt;&lt;ref =
bean=3D\&quot;org.apache.portals.graffito.ContentServerService\&quot;/&gt;&=
lt;/entry&gt;&lt;entry key=3D\&quot;ContentModel\&quot;&gt;&lt;ref bean=3D\=
&quot;org.apache.portals.graffito.ContentModelService\&quot;/&gt;&lt;/entry=
&gt;\1"=20
+				/>
+			</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-deplo=
y/src/pages/graffito.psml?view=3Ddiff&r1=3D155068&r2=3D155069
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml (orig=
inal)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml Wed F=
eb 23 12:51:24 2005
@@ -7,7 +7,7 @@
     <short-title>Graffito</short-title>
     <defaults skin=3D"orange" layout-decorator=3D"tigris" portlet-decorato=
r=3D"tigris"/>
     <fragment id=3D"gf-1" type=3D"layout" name=3D"jetspeed::VelocityOneCol=
umn">
-        <fragment id=3D"gf-2" type=3D"portlet" name=3D"graffito-browser::g=
raffitoBrowser">
+        <fragment id=3D"graffitoBrowser" type=3D"portlet" name=3D"graffito=
-browser::graffitoBrowser">
             <property name=3D"row" value=3D"0" layout=3D"OneColumn"/>
             <property name=3D"column" value=3D"0" layout=3D"OneColumn"/>
         </fragment>