Author: djencks
Date: Mon May 11 16:31:09 2009
New Revision: 773618
URL: http://svn.apache.org/viewvc?rev=773618&view=rev
Log:
PORTALS-14 Hardcode versions into maven-bundle-plugin configuration, finish
converting to use package-info.java files, specficy java v. 1.4 in 1.0 pom
Added:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java
(with props)
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java
(with props)
Removed:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package.html
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package.html
Modified:
portals/portlet-spec/trunk/portlet-api-1.0/pom.xml
portals/portlet-spec/trunk/portlet-api-2.0/pom.xml
Modified: portals/portlet-spec/trunk/portlet-api-1.0/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-1.0/pom.xml?rev=773618&r1=773617&r2=773618&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-1.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-1.0/pom.xml Mon May 11 16:31:09 2009
@@ -17,12 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<!--
- A basic Maven 2 build for the JSR-186 sources.
- Use 'mvn package' to create the jar in the target directory or
- 'mvn install' to package the jar and install it in
- your local Maven repository.
- -->
+
+
<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";>
@@ -35,11 +31,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>portlet-api_1.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Java Portlet Specification V1.0</name>
<description>The Java Portlet API version 1.0 developed by the Java
Community Process JSR-168 Expert Group.</description>
- <!--<url>http://www.jcp.org/en/jsr/detail?id=168</url>-->
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/portals/portlet-spec/trunk/portlet-api-1.0</connection>
@@ -47,39 +42,29 @@
<url>http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-1.0</url>
</scm>
- <properties>
- <!--
- |
- | Portals OSGi properties
- |
- | Note: modules can override these properties.
- |
- -->
- <!--<portals.osgi.import.pkg>*</portals.osgi.import.pkg>-->
- <!--<portals.osgi.export.pkg>*</portals.osgi.export.pkg>-->
- <!--<portals.osgi.private.pkg/>-->
-
<!--<portals.osgi.export>!META-INF*,${portals.osgi.export.pkg}*;version=${portals.osgi.export.version}</portals.osgi.export>-->
- <!--<portals.osgi.export.version>1.0</portals.osgi.export.version>-->
-
<!--<portals.osgi.import>!META-INF*,${portals.osgi.import.pkg}</portals.osgi.import>-->
-
<!--<portals.osgi.symbolic.name>${groupId}.${artifactId}</portals.osgi.symbolic.name>-->
- </properties>
<build>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <!--<Bundle-Name>${artifactId}</Bundle-Name>-->
-
<!--<Bundle-SymbolicName>${portals.osgi.symbolic.name}</Bundle-SymbolicName>-->
- <!--<Export-Package>${portals.osgi.export}</Export-Package>-->
- <!--<Import-Package>${portals.osgi.import}</Import-Package>-->
-
<!--<Private-Package>${portals.osgi.private.pkg}</Private-Package>-->
-
<!--<Implementation-Title>${project.name}</Implementation-Title>-->
-
<!--<Implementation-Version>${project.version}</Implementation-Version>-->
+ <Export-Package>javax.portlet;version=1.0.0</Export-Package>
+ <Import-Package>javax.portlet;version=1.0.0</Import-Package>
+ <Private-Package/>
+ <Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
</instructions>
</configuration>
</plugin>
Added:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java?rev=773618&view=auto
==============================================================================
---
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java
(added)
+++
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java
Mon May 11 16:31:09 2009
@@ -0,0 +1,38 @@
+/**
+ * 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 javax.portlet package defines the API for portlets.
+ * <p>
+ * A portlet is a Java technology based web component, managed by a portlet
container,
+ * that processes requests and generates dynamic content. Portlets provide a
presentation
+ * layer to Information Systems.
+ * <p>
+ * Portlets generate fragments of markup (e.g. HTML, XHTML, WML). A portal
combines markup
+ * fragments generated by different portlets into a portal page.
+ * <p>
+ * A portlet container manages the lifecyle of portlets. It also provides the
required runtime environment.
+ * <p>
+ * Portlets are bundled in Portlet Applications as web applications using the
WAR file format.
+ * A portlet application consists of two deployment descriptors: one to specify
+ * the web application resources (web.xml) and one to specify the portlet
resources
+ * (portlet.xml). The portlet.xml deployment descriptor must conform to the
schema identified
+ * by the namespace http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd.
+ * <p>
+ */
+
+package javax.portlet;
\ No newline at end of file
Propchange:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/java/javax/portlet/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/portlet-spec/trunk/portlet-api-2.0/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-2.0/pom.xml?rev=773618&r1=773617&r2=773618&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-2.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-2.0/pom.xml Mon May 11 16:31:09 2009
@@ -17,12 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!--
- A basic Maven 2 build for the JSR-286 sources.
- Use 'mv package' to create the jar in the target directory or
- 'mvn install' to package the jar and install it in
- your local Maven repository.
- -->
+
<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";>
@@ -39,21 +34,20 @@
<packaging>bundle</packaging>
<name>Java Portlet Specification V2.0</name>
<description>The Java Portlet API version 2.0 developed by the Java
Community Process JSR-286 Expert Group.</description>
- <!--<url>http://www.jcp.org/en/jsr/detail?id=286</url>-->
<dependencies>
- <!--<dependency>-->
- <!--<groupId>javax.servlet</groupId>-->
- <!--<artifactId>servlet-api</artifactId>-->
- <!--<version>2.4</version>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-servlet_2.5_spec</artifactId>-->
+ <!--<version>1.2</version>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
</dependencies>
<scm>
@@ -94,57 +88,59 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!--<version>1.4.3</version>-->
<version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <!--<Bundle-Name>${artifactId}</Bundle-Name>-->
-
<!--<Bundle-SymbolicName>${portals.osgi.symbolic.name}</Bundle-SymbolicName>-->
- <!--<Export-Package>${portals.osgi.export}</Export-Package>-->
- <!--<Import-Package>${portals.osgi.import}</Import-Package>-->
-
<!--<Private-Package>${portals.osgi.private.pkg}</Private-Package>-->
-
<!--<Implementation-Title>${project.name}</Implementation-Title>-->
-
<!--<Implementation-Version>${project.version}</Implementation-Version>-->
- <!--<version>2.0</version>-->
- <!--<_versionpolicy>${bnd.version.policy}</_versionpolicy>-->
+
<Export-Package>javax.portlet.filter;uses:="javax.portlet,javax.xml.namespace,javax.servlet.http,org.w3c.dom";version=2.0.0,
+
javax.portlet;uses:="javax.xml.namespace,javax.servlet.http,org.w3c.dom";version=2.0.0
+ </Export-Package>
+ <Import-Package>javax.portlet;version=2.0.0,
+ javax.portlet.filter;version=2.0.0,
+ javax.servlet.http;version=2.4,
+ javax.xml.namespace,
+ org.w3c.dom
+ </Import-Package>
+ <Private-Package/>
+ <Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
</instructions>
</configuration>
</plugin>
<!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<version>2.1</version>-->
- <!--<configuration>-->
- <!--<archive>-->
-
<!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>-->
- <!--</archive>-->
- <!--</configuration>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-jar-plugin</artifactId>-->
+ <!--<version>2.1</version>-->
+ <!--<configuration>-->
+ <!--<archive>-->
+
<!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>-->
+ <!--</archive>-->
+ <!--</configuration>-->
<!--</plugin>-->
<!-- previous code to install bundle manifest entries by hand -->
<!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<archive>-->
- <!--<manifestEntries>-->
- <!--<Bundle-ManifestVersion>2</Bundle-ManifestVersion>-->
- <!--<Bundle-SymbolicName>javax.portlet</Bundle-SymbolicName>-->
- <!--<Bundle-Name>JSR 286</Bundle-Name>-->
-
<!--<Bundle-DocURL>http://www.jcp.org/en/jsr/detail?id=286</Bundle-DocURL>-->
- <!--<Bundle-Version>2.0</Bundle-Version>-->
- <!--<Export-Package>-->
- <!--javax.portlet;version="2.0.0",-->
- <!--javax.portlet.filter;version="2.0.0"-->
- <!--</Export-Package>-->
- <!--<Import-Package>-->
- <!--org.w3c.dom,-->
- <!--javax.xml.namespace,-->
- <!--javax.servlet.http; version="2.4.0"-->
- <!--</Import-Package>-->
- <!--</manifestEntries>-->
- <!--</archive>-->
- <!--</configuration>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-jar-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<archive>-->
+ <!--<manifestEntries>-->
+ <!--<Bundle-ManifestVersion>2</Bundle-ManifestVersion>-->
+ <!--<Bundle-SymbolicName>javax.portlet</Bundle-SymbolicName>-->
+ <!--<Bundle-Name>JSR 286</Bundle-Name>-->
+
<!--<Bundle-DocURL>http://www.jcp.org/en/jsr/detail?id=286</Bundle-DocURL>-->
+ <!--<Bundle-Version>2.0</Bundle-Version>-->
+ <!--<Export-Package>-->
+ <!--javax.portlet;version="2.0.0",-->
+ <!--javax.portlet.filter;version="2.0.0"-->
+ <!--</Export-Package>-->
+ <!--<Import-Package>-->
+ <!--org.w3c.dom,-->
+ <!--javax.xml.namespace,-->
+ <!--javax.servlet.http; version="2.4.0"-->
+ <!--</Import-Package>-->
+ <!--</manifestEntries>-->
+ <!--</archive>-->
+ <!--</configuration>-->
<!--</plugin>-->
</plugins>
</pluginManagement>
Added:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java?rev=773618&view=auto
==============================================================================
---
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java
(added)
+++
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java
Mon May 11 16:31:09 2009
@@ -0,0 +1,23 @@
+/* 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 javax.portlet.filter package defines the filter APIs for the Java
Portlet Specification.
+ */
+
+package javax.portlet.filter;
\ No newline at end of file
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/filter/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
