portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r644679 - in /portals/jetspeed-2/portal/trunk: applications/ applications/jetspeed-demo/ applications/jetspeed-layouts/ applications/jetspeed-layouts/src/main/webapp/WEB-INF/ components/ components/jetspeed-layout-portlets/
Date Fri, 04 Apr 2008 10:51:03 GMT
Author: ate
Date: Fri Apr  4 03:51:01 2008
New Revision: 644679

URL: http://svn.apache.org/viewvc?rev=644679&view=rev
Log:
Completing the assimilation of jetspeed-layouts.
Oh: and the new war is now +/- 3Mb smaller!

Added:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml   (with props)
Removed:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/portlet.tld
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/   (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/web.xml
    portals/jetspeed-2/portal/trunk/applications/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/   (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml
    portals/jetspeed-2/portal/trunk/components/pom.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml?rev=644679&r1=644678&r2=644679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml Fri Apr  4 03:51:01
2008
@@ -130,8 +130,8 @@
           <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-layouts</artifactId>
-            <version>2.1.3</version>
-            <type>war</type>
+            <version>${pom.version}</version>
+            <type>war</type>            
           </dependency>
 
               <!-- plugin own dependencies -->

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr  4 03:51:01 2008
@@ -0,0 +1 @@
+target

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml?rev=644679&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml Fri Apr  4 03:51:01
2008
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+  
+  $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.8</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-layouts</artifactId>
+  <name>Jetspeed-2 Layouts Portlet Application</name>
+  <description>Jetspeed-2 Layouts Portlet Application</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>applications</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <packaging>war</packaging>
+
+  <dependencies>
+    <!-- Runtime Dependencies -->
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-layout-portlets</artifactId>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+  </dependencies>
+
+</project>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/web.xml?rev=644679&r1=644678&r2=644679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/web.xml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/web.xml
Fri Apr  4 03:51:01 2008
@@ -18,31 +18,6 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
                          "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
-  <display-name>Jetspeed 2 Core Portlets</display-name>
-  <description>Jetspeed 2 Core Portlets</description>
-
-  <servlet>
-    <servlet-name>JetspeedContainer</servlet-name>
-    <display-name>Jetspeed Container</display-name>
-    <description>MVC Servlet for Jetspeed Portlet Applications</description>
-    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-    <init-param>
-      <param-name>contextName</param-name>
-      <param-value>jetspeed-layouts</param-value>
-    </init-param>    
-  </servlet>
-
-  <servlet-mapping>
-     <servlet-name>
-        JetspeedContainer
-     </servlet-name>
-     <url-pattern>/container/*</url-pattern>
-  </servlet-mapping>
-  
-  <!-- Portlet tag library TLD -->
-  <taglib>
-    <taglib-uri>portlet.tld</taglib-uri>
-    <taglib-location>/WEB-INF/portlet.tld</taglib-location>
-  </taglib>
-  
+  <display-name>Jetspeed 2 Layout Portlets Application</display-name>
+  <description>Jetspeed 2 Layout Portlets Applications</description>
 </web-app>

Modified: portals/jetspeed-2/portal/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/pom.xml?rev=644679&r1=644678&r2=644679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/pom.xml Fri Apr  4 03:51:01 2008
@@ -36,11 +36,9 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>jetspeed-layouts</module>
         <module>jetspeed</module>
         <module>jetspeed-demo</module>
-<!--        
-        <module>layout-portlets</module>
--->        
     </modules>
 
 </project>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr  4 03:51:01 2008
@@ -0,0 +1 @@
+target

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml?rev=644679&r1=644678&r2=644679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/pom.xml Fri Apr  4
03:51:01 2008
@@ -58,6 +58,13 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
 
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>

Modified: portals/jetspeed-2/portal/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/pom.xml?rev=644679&r1=644678&r2=644679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/pom.xml Fri Apr  4 03:51:01 2008
@@ -60,6 +60,7 @@
         <module>jetspeed-utils</module>
         <module>jetspeed-web-content</module>
         <module>jetspeed-webapp-logging</module>
-    </modules>
+        <module>jetspeed-layout-portlets</module>
+</modules>
     
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message