You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/08/29 14:20:07 UTC
svn commit: r264125 - in /portals/jetspeed-2/branches/SummersOfCode-2005: ./
content-server/src/java/org/apache/jetspeed/contentserver/
jetspeed-api/src/java/org/apache/jetspeed/om/page/
Author: sgala
Date: Mon Aug 29 05:19:50 2005
New Revision: 264125
URL: http://svn.apache.org/viewcvs?rev=264125&view=rev
Log:
more sync
Added:
portals/jetspeed-2/branches/SummersOfCode-2005/jetspeed-api/src/java/org/apache/jetspeed/om/page/Defaults.java
- copied unchanged from r263864, portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Defaults.java
Modified:
portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/AbstractContentLocator.java
portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentFilter.java
portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocatingResponseWrapper.java
portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocator.java
portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/SimpleContentLocator.java
portals/jetspeed-2/branches/SummersOfCode-2005/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java
portals/jetspeed-2/branches/SummersOfCode-2005/project-info.xml (contents, props changed)
portals/jetspeed-2/branches/SummersOfCode-2005/project.properties
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/AbstractContentLocator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/AbstractContentLocator.java?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/AbstractContentLocator.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/AbstractContentLocator.java Mon Aug 29 05:19:50 2005
@@ -17,7 +17,6 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -25,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,24 +42,33 @@
*
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
* @version $Id$
- *
+ *
*/
public abstract class AbstractContentLocator implements ContentLocator
{
protected String rootPath;
+
protected boolean useCachedLookup;
- protected static final Map fileCache = new HashMap();
- protected static final Map contentCache = new HashMap();
+
+ protected static final Map fileCache = new HashMap();
+
protected String[] URLHints;
+
protected static final Log log = LogFactory.getLog(SimpleContentLocator.class);
+
protected String contextRoot;
+
protected String URI;
+
protected List lookupPathes;
+
private String basePath;
- public AbstractContentLocator( String rootPath, String[] URLHints, boolean useCachedLookup, String contextRoot,
- String URI, List lookupPathes )
+ protected File contentFile;
+
+ public AbstractContentLocator(String rootPath, String[] URLHints, boolean useCachedLookup, String contextRoot,
+ String URI, List lookupPathes) throws FileNotFoundException
{
this.contextRoot = contextRoot;
this.rootPath = rootPath;
@@ -67,17 +76,27 @@
this.URLHints = URLHints;
this.URI = URI;
this.lookupPathes = lookupPathes;
+ String realPath = getRealPath();
+ if (realPath != null)
+ {
+ this.contentFile = new File(realPath);
+ }
+ else
+ {
+ throw new FileNotFoundException("Target path " + URI + " not found withint the content locations provided");
+ }
+
}
public OutputStream getOutputStream() throws IOException
{
- File content = new File(getRealPath());
- BufferedOutputStream bos = new BufferedOutputStream(new ByteArrayOutputStream((int) content.length()));
+
+ BufferedOutputStream bos = new BufferedOutputStream(new ByteArrayOutputStream((int) contentFile.length()));
writeToOutputStream(bos);
return bos;
}
- public long writeToOutputStream( OutputStream stream ) throws IOException
+ public long writeToOutputStream(OutputStream stream) throws IOException
{
InputStream is = getInputStream();
@@ -130,54 +149,27 @@
* @param lookupPathes
* @return
* @throws IOException
- * @throws FileNotFoundException if the content cannot be found
+ * @throws FileNotFoundException
+ * if the content cannot be found
*/
public InputStream getInputStream() throws IOException
{
String realPath = getRealPath();
-
- if(realPath == null)
+
+ if (realPath == null)
{
- throw new FileNotFoundException("The "+URI+" could not be resolved by the ContentLocator");
+ throw new FileNotFoundException("The " + URI + " could not be resolved by the ContentLocator");
}
-
- if (contentCache.containsKey(realPath) && useCachedLookup)
- {
- byte[] contentInBytes =(byte[]) contentCache.get(realPath);
- return new BufferedInputStream(new ByteArrayInputStream(contentInBytes));
+ if (contentFile != null)
+ {
+ return new BufferedInputStream(new FileInputStream(contentFile));
}
else
{
- File content = new File(realPath);
-
- if (content != null)
- {
- if(useCachedLookup)
- {
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(content));
- int size = (int) content.length();
- int i = 0;
- byte[] buffer = new byte[size];
- for (int j = bis.read(); j != -1; j = bis.read())
- {
- buffer[i] = (byte) j;
- i++;
- }
-
- contentCache.put(realPath, buffer);
- return new BufferedInputStream(new ByteArrayInputStream(buffer));
- }
- else
- {
- return new BufferedInputStream(new FileInputStream(content));
- }
- }
- else
- {
- throw new FileNotFoundException("Failed to load content source "+realPath);
- }
+ throw new FileNotFoundException("Failed to load content source " + realPath);
}
+
}
public String getBasePath()
@@ -188,7 +180,7 @@
if (absPath != null)
{
- absPath = absPath.replace('\\','/');
+ absPath = absPath.replace('\\', '/');
int startOffset = absPath.indexOf(contextRoot) + contextRoot.length();
basePath = absPath.substring(startOffset, absPath.length());
}
@@ -199,6 +191,11 @@
}
return basePath;
+ }
+
+ public Date getLastModified()
+ {
+ return new Date(contentFile.lastModified());
}
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentFilter.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentFilter.java?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentFilter.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentFilter.java Mon Aug 29 05:19:50 2005
@@ -18,9 +18,15 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.StringTokenizer;
+import java.util.TimeZone;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -61,7 +67,14 @@
protected String[] urlHints;
protected boolean useCache;
-
+
+ static DateFormat HEADER_DATE_FORMAT = new SimpleDateFormat("EEE, d MMM yyyy hh:mm:ss zzz");
+
+ public ContentFilter()
+ {
+ HEADER_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
+ }
+
/**
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
@@ -107,42 +120,57 @@
public void doFilter( ServletRequest request, ServletResponse response, FilterChain chain ) throws IOException,
ServletException
{
- if (request instanceof HttpServletRequest)
+ try
{
- HttpServletRequest httpRequest = (HttpServletRequest) request;
- HttpServletResponse httpResponse = (HttpServletResponse) response;
- String requestURI = httpRequest.getRequestURI();
-
- SimpleContentLocator contentLocator = new SimpleContentLocator(this.contentDir, urlHints, useCache, httpRequest
- .getContextPath(), requestURI, getContentSearchPathes(httpRequest));
-
- ContentLocatingResponseWrapper respWrapper = new ContentLocatingResponseWrapper(httpResponse,
- contentLocator);
-
- ContentLocatingRequestWrapper reqWrapper = new ContentLocatingRequestWrapper(httpRequest,
- contentLocator);
- httpRequest.setAttribute("org.apache.jetspeed.content.filtered", "true");
- chain.doFilter(reqWrapper, respWrapper);
- if(!respWrapper.wasLocationAttempted() && !respWrapper.outputStreamCalled && !respWrapper.writerCalled)
+ if (request instanceof HttpServletRequest)
{
- try
- {
- httpResponse.setContentLength((int) contentLocator.writeToOutputStream(httpResponse.getOutputStream()));
- httpResponse.setStatus(HttpServletResponse.SC_OK);
- }
- catch (FileNotFoundException e)
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+ String requestURI = httpRequest.getRequestURI();
+
+ SimpleContentLocator contentLocator = new SimpleContentLocator(this.contentDir, urlHints, useCache, httpRequest
+ .getContextPath(), requestURI, getContentSearchPathes(httpRequest));
+
+ ContentLocatingResponseWrapper respWrapper = new ContentLocatingResponseWrapper(httpResponse,
+ contentLocator);
+
+ ContentLocatingRequestWrapper reqWrapper = new ContentLocatingRequestWrapper(httpRequest,
+ contentLocator);
+ httpRequest.setAttribute("org.apache.jetspeed.content.filtered", "true");
+ chain.doFilter(reqWrapper, respWrapper);
+ if(!respWrapper.wasLocationAttempted() && !respWrapper.outputStreamCalled && !respWrapper.writerCalled)
{
- httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
+ try
+ {
+ if(resourceContentRequired(httpRequest, contentLocator))
+ {
+ httpResponse.setContentLength((int) contentLocator.writeToOutputStream(httpResponse.getOutputStream()));
+ httpResponse.setStatus(HttpServletResponse.SC_OK);
+ }
+ else
+ {
+ httpResponse.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+ }
+
+ }
+ catch (FileNotFoundException e)
+ {
+ httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
+ }
+
}
-
-
- }
+ }
+ else
+ {
+ chain.doFilter(request, response);
+ }
}
- else
+ catch (FileNotFoundException e)
{
chain.doFilter(request, response);
}
+
}
@@ -163,5 +191,28 @@
// .setAttribute(SESSION_THEME_ATTR, contentPathes);
}
return contentPathes;
+ }
+
+ protected boolean resourceContentRequired(HttpServletRequest request, ContentLocator contentLocator)
+ {
+ String dateString = request.getHeader("If-Modified-Since");
+ if (dateString != null)
+ {
+ try
+ {
+ Date ifModifiedSince = HEADER_DATE_FORMAT.parse(dateString);
+ Date lastModified = contentLocator.getLastModified();
+ return lastModified.after(ifModifiedSince);
+ }
+ catch (ParseException e)
+ {
+ // Unreadable date string
+ return true;
+ }
+ }
+ else
+ {
+ return true;
+ }
}
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocatingResponseWrapper.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocatingResponseWrapper.java?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocatingResponseWrapper.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocatingResponseWrapper.java Mon Aug 29 05:19:50 2005
@@ -1,8 +1,17 @@
/*
- * Created on Aug 10, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * Copyright 2000-2001,2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
*/
package org.apache.jetspeed.contentserver;
@@ -46,8 +55,11 @@
{
super(response);
this.contentLocator = contentLocator;
- this.response = response;
-
+ this.response = response;
+
+ this.response.setHeader("Last-Modified", ContentFilter.HEADER_DATE_FORMAT.format(contentLocator.getLastModified()));
+ this.response.setHeader("Cache-Control", "max-age=3600, must-revalidate, proxy-revalidate");
+ this.response.setHeader("Apache-Jetspeed-Info", "real-path="+this.contentLocator.getBasePath());
}
/**
@@ -98,6 +110,22 @@
locationAttempted = true;
setContentLength((int) contentLocator.writeToOutputStream(getOutputStream()));
setStatus(SC_OK);
+ }
+ catch (IllegalStateException ise)
+ {
+ // on WebSphere this occurs all the time, killing most of the content:
+ // java.lang.IllegalStateException: ERROR: Cannot set header. Response already committed.
+ // Note: This is a temporary workaround. The real cause still has to be found.
+ try
+ {
+ super.sendError(SC_NOT_FOUND, message);
+ }
+ catch (Exception unexpected)
+ {
+ // and still, on WebSphere just sending the error (as requested from within a WebSphere
+ // SimpleFileServlet fails most of the time.
+ // So, killing the error is the last resort.
+ }
}
catch (FileNotFoundException e)
{
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocator.java?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocator.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/ContentLocator.java Mon Aug 29 05:19:50 2005
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Date;
/**
@@ -41,4 +42,6 @@
long writeToOutputStream(OutputStream stream) throws IOException;
String getBasePath();
+
+ Date getLastModified();
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/SimpleContentLocator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/SimpleContentLocator.java?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/SimpleContentLocator.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/content-server/src/java/org/apache/jetspeed/contentserver/SimpleContentLocator.java Mon Aug 29 05:19:50 2005
@@ -16,6 +16,7 @@
package org.apache.jetspeed.contentserver;
import java.io.File;
+import java.io.FileNotFoundException;
import java.util.List;
/**
@@ -39,8 +40,9 @@
* @param contextRoot
* @param URI
* @param lookupPathes
+ * @throws FileNotFoundException
*/
- public SimpleContentLocator( String rootPath, String[] URLHints, boolean useCachedLookup, String contextRoot, String URI, List lookupPathes )
+ public SimpleContentLocator( String rootPath, String[] URLHints, boolean useCachedLookup, String contextRoot, String URI, List lookupPathes ) throws FileNotFoundException
{
super(rootPath, URLHints, useCachedLookup, contextRoot, URI, lookupPathes);
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java Mon Aug 29 05:19:50 2005
@@ -107,5 +107,11 @@
* @param definitions definition list
*/
void setMenuDefinitions(List definitions);
+
+ /**
+ * Returns the defaults object defined for this page.
+ * @return
+ */
+ Defaults getDefaults();
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/project-info.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/project-info.xml?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/project-info.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/project-info.xml Mon Aug 29 05:19:50 2005
@@ -1,218 +1,218 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.xml 189937 2005-06-10 10:51:53Z ate $
--->
-<project>
- <pomVersion>3</pomVersion>
- <name>Jetspeed 2 Enterprise Portal</name>
- <groupId>jetspeed2</groupId>
- <currentVersion>${jetspeed.version}</currentVersion>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://portals.apache.org/</url>
- <logo>http://portals.apache.org/images/apache-portals.gif</logo>
- </organization>
- <inceptionYear>1999</inceptionYear>
- <package>org.apache.jetspeed</package>
- <description>Jetspeed is an Open Source implementation of an Enterprise Information Portal, using Java and XML.</description>
- <shortDescription>Enterprise Information Portal</shortDescription>
- <url>http://portals.apache.org/jetspeed-2</url>
- <issueTrackingUrl>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10492</issueTrackingUrl>
- <siteAddress>portals.apache.org</siteAddress>
- <siteDirectory>/www/portals.apache.org/jetspeed-2-generated</siteDirectory>
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/</url>
- </repository>
- <mailingLists>
- <mailingList>
- <name>Jetspeed 2 User List</name>
- <subscribe>jetspeed-user-subscribe@portals.apache.org</subscribe>
- <unsubscribe>jetspeed-user-unsubscribe@portals.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/portals-jetspeed-user/</archive>
- </mailingList>
- <mailingList>
- <name>Jetspeed 2 Developer List</name>
- <subscribe>jetspeed-dev-subscribe@portals.apache.org</subscribe>
- <unsubscribe>jetspeed-dev-unsubscribe@portals.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/portals-jetspeed-dev/</archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <name>David Sean Taylor</name>
- <id>taylor</id>
- <email>taylor@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Raphael Luta</name>
- <id>raphael</id>
- <email>raphael@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Mark Orciuch</name>
- <id>mark</id>
- <email>mark_oriuch@nqsltd.com</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Paul Spencer</name>
- <id>paulsp</id>
- <email>paulsp@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Scott Weaver</name>
- <id>weaver</id>
- <email>Sweaver@rippe.com</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Roger Ruttimann</name>
- <id>roger</id>
- <email>rogerrut@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>David Le Strat</name>
- <id>dls</id>
- <email>dlestrat@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jeremy Ford</name>
- <id>jford</id>
- <email>jford@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Ate Douma</name>
- <id>ate</id>
- <email>ate@apache.org</email>
- <timezone>+2</timezone>
- <organization>iWise B.V.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Shinsuke Sugaya</name>
- <id>shinsuke</id>
- <email>shinsuke@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- </developers>
-
-
- <build>
- <nagEmailAddress>david@bluesunrise.com</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
-
- <unitTest>
- <excludes>
- <exclude>org/apache/jetspeed/test/JetspeedTest</exclude>
- <exclude>org/apache/jetspeed/test/JetspeedTestSuite</exclude>
- <exclude>**/TestJMX*.java</exclude>
- <exclude>**/TestEngine.java</exclude>
- </excludes>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <!--
- <exclude>**/JETSPEED-INF/**</exclude>
- -->
- </excludes>
- </resource>
- <resource>
- <directory>../etc/log4j</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>../etc/db-ojb</directory>
- <includes>
- <include>*.xml</include>
- <include>*.dtd</include>
- <include>*.properties</include>
- </includes>
- </resource>
- </unitTest>
-
- </build>
-
- <reports>
- <report>maven-jdepend-plugin</report>
- <!--
- <report>maven-checkstyle-plugin</report>
- -->
- <report>maven-pmd-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jcoverage-plugin</report>
-<!--
- <report>maven-linkcheck-plugin</report>
--->
- <report>maven-tasklist-plugin</report>
- <report>maven-dashboard-plugin</report>
- <report>maven-multiproject-plugin</report>
- <report>maven-multichanges-plugin</report>
- </reports>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.xml 189937 2005-06-10 10:51:53Z ate $
+-->
+<project>
+ <pomVersion>3</pomVersion>
+ <name>Jetspeed 2 Enterprise Portal</name>
+ <groupId>jetspeed2</groupId>
+ <currentVersion>${jetspeed.version}</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://portals.apache.org/</url>
+ <logo>http://portals.apache.org/images/apache-portals.gif</logo>
+ </organization>
+ <inceptionYear>1999</inceptionYear>
+ <package>org.apache.jetspeed</package>
+ <description>Jetspeed is an Open Source implementation of an Enterprise Information Portal, using Java and XML.</description>
+ <shortDescription>Enterprise Information Portal</shortDescription>
+ <url>http://portals.apache.org/jetspeed-2</url>
+ <issueTrackingUrl>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10492</issueTrackingUrl>
+ <siteAddress>portals.apache.org</siteAddress>
+ <siteDirectory>/www/portals.apache.org/jetspeed-2-generated</siteDirectory>
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/</url>
+ </repository>
+ <mailingLists>
+ <mailingList>
+ <name>Jetspeed 2 User List</name>
+ <subscribe>jetspeed-user-subscribe@portals.apache.org</subscribe>
+ <unsubscribe>jetspeed-user-unsubscribe@portals.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/portals-jetspeed-user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Jetspeed 2 Developer List</name>
+ <subscribe>jetspeed-dev-subscribe@portals.apache.org</subscribe>
+ <unsubscribe>jetspeed-dev-unsubscribe@portals.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/portals-jetspeed-dev/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <name>David Sean Taylor</name>
+ <id>taylor</id>
+ <email>taylor@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Raphael Luta</name>
+ <id>raphael</id>
+ <email>raphael@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Mark Orciuch</name>
+ <id>mark</id>
+ <email>mark_oriuch@nqsltd.com</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Paul Spencer</name>
+ <id>paulsp</id>
+ <email>paulsp@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Scott Weaver</name>
+ <id>weaver</id>
+ <email>Sweaver@rippe.com</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Roger Ruttimann</name>
+ <id>roger</id>
+ <email>rogerrut@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>David Le Strat</name>
+ <id>dls</id>
+ <email>dlestrat@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jeremy Ford</name>
+ <id>jford</id>
+ <email>jford@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Ate Douma</name>
+ <id>ate</id>
+ <email>ate@apache.org</email>
+ <timezone>+2</timezone>
+ <organization>iWise B.V.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Shinsuke Sugaya</name>
+ <id>shinsuke</id>
+ <email>shinsuke@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+
+ <build>
+ <nagEmailAddress>david@bluesunrise.com</nagEmailAddress>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <unitTest>
+ <excludes>
+ <exclude>org/apache/jetspeed/test/JetspeedTest</exclude>
+ <exclude>org/apache/jetspeed/test/JetspeedTestSuite</exclude>
+ <exclude>**/TestJMX*.java</exclude>
+ <exclude>**/TestEngine.java</exclude>
+ </excludes>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <!--
+ <exclude>**/JETSPEED-INF/**</exclude>
+ -->
+ </excludes>
+ </resource>
+ <resource>
+ <directory>../etc/log4j</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../etc/db-ojb</directory>
+ <includes>
+ <include>*.xml</include>
+ <include>*.dtd</include>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ </unitTest>
+
+ </build>
+
+ <reports>
+ <report>maven-jdepend-plugin</report>
+ <!--
+ <report>maven-checkstyle-plugin</report>
+ -->
+ <report>maven-pmd-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jcoverage-plugin</report>
+<!--
+ <report>maven-linkcheck-plugin</report>
+-->
+ <report>maven-tasklist-plugin</report>
+ <report>maven-dashboard-plugin</report>
+ <report>maven-multiproject-plugin</report>
+ <report>maven-multichanges-plugin</report>
+ </reports>
+</project>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/project-info.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/project.properties?rev=264125&r1=264124&r2=264125&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/project.properties (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/project.properties Mon Aug 29 05:19:50 2005
@@ -15,7 +15,7 @@
# jetspeed.version is required is {user.home}/build.properties.
# Other properties.
jetspeed.version=2.0-M4-SNAPSHOT
-pluto.version=1.0-svn-201864
+pluto.version=1.0.1-rc4
portlet.api.version=1.0
servlet.api.version=2.3
myfaces.version=1.0.9
@@ -57,7 +57,7 @@
maven.test.skip=true
maven.junit.fork=true
-maven.compile.fork=yes
+maven.compile.fork=false
# Include private method and field in Javadoc.
# Note: make sure only one is set to true (which is the reason to define all tree: default protected scope is true)
@@ -126,11 +126,6 @@
org.apache.jetspeed.test.jdbc.drivers.path=
org.apache.jetspeed.test.database.default.name=hsql
-
-# The database to use with OJB. Substitution value for repository_database.xml jdbc-connection-descriptor
-# platform attribute.
-org.apache.jetspeed.production.database.ojb.platform=Hsqldb
-org.apache.jetspeed.test.database.ojb.platform=Hsqldb
# plugin defaults overrides for building jetspeed portal just as with a generated custom portal setup
org.apache.jetspeed.portal.home=${org.apache.jetspeed.project.home}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org