You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by pm...@apache.org on 2007/07/08 07:49:35 UTC
svn commit: r554317 - in
/portals/bridges/trunk/applications/andromda-struts: common/ core/ mda/
mda/src/main/config/mergeLocation/resources/
mda/src/main/config/mergeLocation/resources/calendar/
mda/src/main/config/mergeLocation/templates/bpm4struts/p...
Author: pmd
Date: Sat Jul 7 22:49:34 2007
New Revision: 554317
URL: http://svn.apache.org/viewvc?view=rev&rev=554317
Log:
Removed calendar code by using the merge location feature of andromda. Templates and resources from the cartridge are replaced with the ones in the project.
Also clarified the name of the components so there is no confusion in the build output.
Added:
portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/
portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/
portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/calendar.gif (with props)
portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/menuarrow.gif (with props)
portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/templates/bpm4struts/pages/calendar-js.jsp.vsl
Modified:
portals/bridges/trunk/applications/andromda-struts/common/pom.xml
portals/bridges/trunk/applications/andromda-struts/core/pom.xml
portals/bridges/trunk/applications/andromda-struts/mda/pom.xml
portals/bridges/trunk/applications/andromda-struts/web/pom.xml
Modified: portals/bridges/trunk/applications/andromda-struts/common/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/common/pom.xml?view=diff&rev=554317&r1=554316&r2=554317
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/common/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/common/pom.xml Sat Jul 7 22:49:34 2007
@@ -28,7 +28,7 @@
</parent>
<artifactId>andromda-struts-common</artifactId>
<packaging>jar</packaging>
- <name>Network Monitor Common</name>
+ <name>Andromda Struts Demo Common</name>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: portals/bridges/trunk/applications/andromda-struts/core/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/core/pom.xml?view=diff&rev=554317&r1=554316&r2=554317
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/core/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/core/pom.xml Sat Jul 7 22:49:34 2007
@@ -28,7 +28,7 @@
</parent>
<artifactId>andromda-struts-core</artifactId>
<packaging>jar</packaging>
- <name>Network Monitor Core Business Tier</name>
+ <name>Andromda Struts Demo Core Business Tier</name>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: portals/bridges/trunk/applications/andromda-struts/mda/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/mda/pom.xml?view=diff&rev=554317&r1=554316&r2=554317
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/mda/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/mda/pom.xml Sat Jul 7 22:49:34 2007
@@ -28,7 +28,7 @@
</parent>
<artifactId>andromda-struts-mda</artifactId>
<packaging>pom</packaging>
- <name>Network Monitor MDA</name>
+ <name>Andromda Struts Demo MDA</name>
<dependencies>
<dependency>
<groupId>org.andromda.profiles.uml14</groupId>
Added: portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/calendar.gif
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/calendar.gif?view=auto&rev=554317
==============================================================================
Binary file - no diff available.
Propchange: portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/calendar.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/menuarrow.gif
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/menuarrow.gif?view=auto&rev=554317
==============================================================================
Binary file - no diff available.
Propchange: portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/resources/calendar/menuarrow.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/templates/bpm4struts/pages/calendar-js.jsp.vsl
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/templates/bpm4struts/pages/calendar-js.jsp.vsl?view=auto&rev=554317
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/templates/bpm4struts/pages/calendar-js.jsp.vsl (added)
+++ portals/bridges/trunk/applications/andromda-struts/mda/src/main/config/mergeLocation/templates/bpm4struts/pages/calendar-js.jsp.vsl Sat Jul 7 22:49:34 2007
@@ -0,0 +1,20 @@
+#*
+ 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.
+*#
+## The default calendar is disabled because it is LGPL licensed
+#set ($generatedFile = "calendar-js.jsp")
+
+var calendar = false;
Modified: portals/bridges/trunk/applications/andromda-struts/web/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/web/pom.xml?view=diff&rev=554317&r1=554316&r2=554317
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/web/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/web/pom.xml Sat Jul 7 22:49:34 2007
@@ -28,7 +28,7 @@
</parent>
<artifactId>andromda-struts-web</artifactId>
<packaging>war</packaging>
- <name>Network Monitor Web</name>
+ <name>Andromda Struts Demo Web</name>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org