You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by vk...@apache.org on 2009/04/15 15:33:29 UTC
svn commit: r765187 - in /portals/applications/demo/trunk: ./
src/main/java/org/apache/portals/applications/demo/
src/main/java/org/apache/portals/applications/taglibs/
src/main/java/org/apache/portals/applications/taglibs/velocity/
src/main/java/org/a...
Author: vkumar
Date: Wed Apr 15 13:33:28 2009
New Revision: 765187
URL: http://svn.apache.org/viewvc?rev=765187&view=rev
Log:
Removing un-used dependencies and folders
Correcting artifact and group id pom and parent
Added:
portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/demo/
portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/
portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/
- copied from r765163, portals/applications/demo/trunk/src/main/java/org/apache/taglibs/velocity/
Removed:
portals/applications/demo/trunk/src/main/java/org/apache/taglibs/velocity/
portals/applications/demo/trunk/xdocs/
Modified:
portals/applications/demo/trunk/pom.xml
portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/JSPContext.java
portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/ScopeTool.java
portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/VelocityTag.java
Modified: portals/applications/demo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=765187&r1=765186&r2=765187&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Wed Apr 15 13:33:28 2009
@@ -1,175 +1,150 @@
<?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:$
+ 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.4</maven>
- </prerequisites>
-
- <!-- POM Identification -->
-
- <artifactId>demo</artifactId>
- <parent>
- <groupId>org.apache.portals.applications</groupId>
- <artifactId>applications</artifactId>
- <version>2.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <packaging>war</packaging>
- <name>Portals Demo Portlet Application</name>
- <description>
- Demo Portlets Container
- </description>
-
- <properties>
- <portals.applications.apa-gems.version>2.2-SNAPSHOT</portals.applications.apa-gems.version>
- </properties>
-
- <!-- Dependencies -->
-
- <dependencies>
-
- <!-- Build Dependencies -->
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-api</artifactId>
- <version>2.2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Runtime Dependencies -->
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-webapp-logging</artifactId>
- <version>2.2-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.applications</groupId>
- <artifactId>apa-gems</artifactId>
- <version>${portals.applications.apa-gems.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-web-content</artifactId>
- <version>2.2-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>request</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-velocity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-groovy</artifactId>
- </dependency>
- <dependency>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <!-- for groovy -->
- <dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>1.1-beta-2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.6</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- </dependency>
- </dependencies>
-
- <!-- Project Information -->
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/demo</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/demo</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/demo/</url>
- </scm>
+<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.4</maven>
+ </prerequisites>
+
+ <!-- POM Identification -->
+
+ <artifactId>demo</artifactId>
+ <parent>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>applications-pom</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>war</packaging>
+ <name>Portals Demo Portlet Application</name>
+ <description>Portlets Demo</description>
+
+ <properties>
+ <portlet-api.version>1.0</portlet-api.version>
+ <portals.applications.apa-webapp-logging.version>1.0-SNAPSHOT</portals.applications.apa-webapp-logging.version>
+ <portals.applications.apa-gems.version>1.0-SNAPSHOT</portals.applications.apa-gems.version>
+ <velocity.version>1.5</velocity.version>
+ <velocity-tools.version>1.3</velocity-tools.version>
+ <org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
+ <org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
+ <commons-logging.version>1.1</commons-logging.version>
+ <log4j.version>1.2.14</log4j.version>
+ <javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
+ <javax.servlet.version>2.4</javax.servlet.version>
+ <taglibs-standard.version>1.1.2</taglibs-standard.version>
+ <taglibs-random.version>1.0.2</taglibs-random.version>
+ <taglibs-request.version>1.0.1</taglibs-request.version>
+ <portlet-api.version>2.0</portlet-api.version>
+ <javax.servlet.version>2.4</javax.servlet.version>
+ <javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
+ </properties>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${javax.servlet.jsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${velocity.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.applications</groupId>
+ <artifactId>apa-gems</artifactId>
+ <version>${portals.applications.apa-gems.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.applications</groupId>
+ <artifactId>apa-webapp-logging</artifactId>
+ <version>${portals.applications.apa-webapp-logging.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${javax.servlet.jstl.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${taglibs-standard.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>request</artifactId>
+ <version>${taglibs-request.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-velocity</artifactId>
+ <version>${org.apache.portals.bridges.velocity.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-groovy</artifactId>
+ <version>${org.apache.portals.bridges.groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>${velocity-tools.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/applications/demo/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/applications/demo/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/applications/demo/trunk</url>
+ </scm>
-</project>
\ No newline at end of file
+</project>
Modified: portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/JSPContext.java
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/JSPContext.java?rev=765187&r1=765163&r2=765187&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/JSPContext.java (original)
+++ portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/JSPContext.java Wed Apr 15 13:33:28 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.taglibs.velocity;
+package org.apache.portals.applications.taglibs.velocity;
import java.util.HashMap;
import javax.servlet.jsp.PageContext;
Modified: portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/ScopeTool.java
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/ScopeTool.java?rev=765187&r1=765163&r2=765187&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/ScopeTool.java (original)
+++ portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/ScopeTool.java Wed Apr 15 13:33:28 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.taglibs.velocity;
+package org.apache.portals.applications.taglibs.velocity;
import javax.servlet.jsp.PageContext;
Modified: portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/VelocityTag.java
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/VelocityTag.java?rev=765187&r1=765163&r2=765187&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/VelocityTag.java (original)
+++ portals/applications/demo/trunk/src/main/java/org/apache/portals/applications/taglibs/velocity/VelocityTag.java Wed Apr 15 13:33:28 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.taglibs.velocity;
+package org.apache.portals.applications.taglibs.velocity;
import java.io.Reader;