Author: djencks
Date: Sun May 10 22:46:26 2009
New Revision: 773429
URL: http://svn.apache.org/viewvc?rev=773429&view=rev
Log:
PORTALS-14 update groupId, play with maven-bundle-plugin settings more, and try
out a package-info.java file instead of the package.html file.
Added:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java
(with props)
Removed:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/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=773429&r1=773428&r2=773429&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-1.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-1.0/pom.xml Sun May 10 22:46:26 2009
@@ -33,20 +33,17 @@
<version>1.1</version>
</parent>
- <groupId>javax.portlet</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>portlet-api_1.0_spec</artifactId>
<version>1.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>
+ <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>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/portlet-spec/trunk/portlet-api-1.0
- </developerConnection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/portlet-spec/trunk/portlet-api-1.0</developerConnection>
<url>http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-1.0</url>
</scm>
@@ -58,14 +55,13 @@
| 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>${project.version}</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>
+ <!--<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>
@@ -73,29 +69,20 @@
<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>
+ <!--<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>-->
</instructions>
</configuration>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<archive>-->
-
<!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>-->
- <!--</archive>-->
- <!--</configuration>-->
- <!--</plugin>-->
</plugins>
</pluginManagement>
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=773429&r1=773428&r2=773429&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-2.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-2.0/pom.xml Sun May 10 22:46:26 2009
@@ -33,21 +33,25 @@
<version>1.1</version>
</parent>
- <groupId>javax.portlet</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>portlet-api_2.0_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<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>
+ <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>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -66,14 +70,15 @@
| 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>${project.version}</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>
+ <!--<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>2.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>-->
+
<!--<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>-->
+ <!--<bnd.version.policy>$(version;==;$(@))</bnd.version.policy>-->
</properties>
<build>
<pluginManagement>
@@ -89,17 +94,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <!--<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>
+ <!--<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>-->
</instructions>
</configuration>
</plugin>
Added:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java?rev=773429&view=auto
==============================================================================
---
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java
(added)
+++
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java
Sun May 10 22:46:26 2009
@@ -0,0 +1,44 @@
+/* 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.
+ */
+
+/*
+ * This source code implements specifications defined by the Java
+ * Community Process. In order to remain compliant with the specification
+ * DO NOT add / change / or delete method signatures!
+ */
+
+/**
+ * The javax.portlet package defines the API for Java Portlet Specification
V2.0.
+ * <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 must follow the schema defined by the
+ * http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd namespace.
+ * <p>
+ */
+package javax.portlet;
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/java/javax/portlet/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
