portals-portalapps-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r946121 [2/3] - in /portals/applications/sandbox/content/trunk: ./ apa-content-portlet/ apa-content-portlet/src/ apa-content-portlet/src/main/ apa-content-portlet/src/main/java/ apa-content-portlet/src/main/java/org/ apa-content-portlet/src...
Date Wed, 19 May 2010 10:57:17 GMT
Added: portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericQueryContentPortlet.properties
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericQueryContentPortlet.properties?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericQueryContentPortlet.properties (added)
+++ portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericQueryContentPortlet.properties Wed May 19 10:57:15 2010
@@ -0,0 +1,26 @@
+# 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$
+#
+
+label.contentPath = Content Path:
+label.repositoryUsername = User name:
+label.repositoryPassword = Password:
+label.repositoryWorkspace = Workspace name:
+
+label.contentUrlBase = Content URL Base:
+label.queryClass = Query Class name:
+label.pageSize = Page size:
+label.queryOrderByClause = Sort order:

Propchange: portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericQueryContentPortlet.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericQueryContentPortlet.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericSearchQueryContentPortlet.properties
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericSearchQueryContentPortlet.properties?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericSearchQueryContentPortlet.properties (added)
+++ portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericSearchQueryContentPortlet.properties Wed May 19 10:57:15 2010
@@ -0,0 +1,26 @@
+# 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$
+#
+
+label.contentPath = Content Path:
+label.repositoryUsername = User name:
+label.repositoryPassword = Password:
+label.repositoryWorkspace = Workspace name:
+
+label.contentUrlBase = Content URL Base:
+label.queryClass = Query Class name:
+label.pageSize = Page size:
+label.queryOrderByClause = Sort order:

Propchange: portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericSearchQueryContentPortlet.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/resources/org/apache/portals/applications/content/resources/GenericSearchQueryContentPortlet.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 19 10:57:15 2010
@@ -0,0 +1 @@
+target

Added: portals/applications/sandbox/content/trunk/apa-content-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-tools/pom.xml?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-tools/pom.xml (added)
+++ portals/applications/sandbox/content/trunk/apa-content-tools/pom.xml Wed May 19 10:57:15 2010
@@ -0,0 +1,71 @@
+<?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>
+
+  <!-- POM Identification -->
+  <parent>
+    <groupId>org.apache.portals.applications</groupId>
+    <artifactId>apa-content</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apa-content-tools</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Portals Applications Content Tools</name>
+  <description>Content Portlet Application Tools</description>
+
+  <dependencies>
+    
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-rmi</artifactId>
+    </dependency>
+    
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <!-- only include this in top level project poms -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/AbstractRepositoryTask.java
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/AbstractRepositoryTask.java?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/AbstractRepositoryTask.java (added)
+++ portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/AbstractRepositoryTask.java Wed May 19 10:57:15 2010
@@ -0,0 +1,149 @@
+/*
+ * 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.
+ */
+package org.apache.portals.applications.content.tools.ant;
+
+import javax.jcr.Credentials;
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.jackrabbit.rmi.client.ClientRepositoryFactory;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * AbstractRepositoryTask
+ */
+public abstract class AbstractRepositoryTask extends Task 
+{
+    
+    private String repositoryUrl;
+    private String repositoryUsername = "";
+    private String repositoryPassword = "";
+    private String repositoryWorkspace;
+    
+    private Repository repository;
+    
+    /**
+     * Does the work.
+     *
+     * @exception BuildException if something goes wrong with the build
+     */
+    public abstract void execute();
+    
+    public String getRepositoryUrl()
+    {
+        return repositoryUrl;
+    }
+
+    public void setRepositoryUrl(String repositoryUrl)
+    {
+        this.repositoryUrl = repositoryUrl;
+    }
+
+    public String getRepositoryUsername()
+    {
+        return repositoryUsername;
+    }
+
+    public void setRepositoryUsername(String repositoryUsername)
+    {
+        this.repositoryUsername = repositoryUsername;
+    }
+
+    public String getRepositoryPassword()
+    {
+        return repositoryPassword;
+    }
+
+    public void setRepositoryPassword(String repositoryPassword)
+    {
+        this.repositoryPassword = repositoryPassword;
+    }
+
+    public String getRepositoryWorkspace()
+    {
+        return repositoryWorkspace;
+    }
+
+    public void setRepositoryWorkspace(String repositoryWorkspace)
+    {
+        this.repositoryWorkspace = repositoryWorkspace;
+    }
+
+    protected Repository getRepository() throws BuildException
+    {
+        if (repository == null)
+        {
+            if (repositoryUrl == null || "".equals(repositoryUrl))
+            {
+                throw new BuildException("Repository URL is not set.");
+            }
+            
+            try
+            {
+                ClientRepositoryFactory factory = new ClientRepositoryFactory();
+                repository = factory.getRepository(repositoryUrl);
+            }
+            catch (Exception e)
+            {
+                throw new BuildException(e);
+            }
+        }
+        
+        return repository;
+    }
+    
+    protected Session getSession() throws BuildException
+    {
+        Session session = null;
+        
+        try
+        {
+            if (repositoryUsername == null || "".equals(repositoryUsername))
+            {
+                if (repositoryWorkspace == null || "".equals(repositoryWorkspace))
+                {
+                    session = getRepository().login();
+                }
+                else
+                {
+                    session = getRepository().login(repositoryWorkspace);
+                }
+            }
+            else
+            {
+                Credentials credentials = new SimpleCredentials(repositoryUsername, repositoryPassword.toCharArray());
+                
+                if (repositoryWorkspace == null || "".equals(repositoryWorkspace))
+                {
+                    session = getRepository().login(credentials);
+                }
+                else
+                {
+                    session = getRepository().login(credentials, repositoryWorkspace);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            throw new BuildException(e);
+        }
+        
+        return session;
+    }
+}

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/AbstractRepositoryTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/AbstractRepositoryTask.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/Import.java
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/Import.java?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/Import.java (added)
+++ portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/Import.java Wed May 19 10:57:15 2010
@@ -0,0 +1,147 @@
+/*
+ * 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.
+ */
+package org.apache.portals.applications.content.tools.ant;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import javax.jcr.ImportUUIDBehavior;
+import javax.jcr.Session;
+import javax.jcr.Workspace;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+ * Writes a message to the Ant logging facilities.
+ *
+ * @ant.task category="jcr"
+ */
+public class Import extends AbstractRepositoryTask 
+{
+    
+    private String parentAbsPath;
+    private File source;
+    private int uuidBehavior = ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW;
+    private boolean useSession;
+    
+    public String getParentAbsPath()
+    {
+        return parentAbsPath;
+    }
+
+    public void setParentAbsPath(String parentAbsPath)
+    {
+        this.parentAbsPath = parentAbsPath;
+    }
+
+    public File getSource()
+    {
+        return source;
+    }
+
+    public void setSource(File source)
+    {
+        this.source = source;
+    }
+
+    public int getUuidBehavior()
+    {
+        return uuidBehavior;
+    }
+
+    public void setUuidBehavior(int uuidBehavior)
+    {
+        this.uuidBehavior = uuidBehavior;
+    }
+    
+    public boolean isUseSession()
+    {
+        return useSession;
+    }
+
+    public void setUseSession(boolean useSession)
+    {
+        this.useSession = useSession;
+    }
+
+    @Override
+    public void execute() throws BuildException 
+    {
+        Session session = null;
+        InputStream is = null;
+        BufferedInputStream bis = null;
+        
+        try
+        {
+            session = getSession();
+            is = new FileInputStream(source);
+            bis = new BufferedInputStream(is);
+            
+            if (useSession)
+            {
+                session.importXML(parentAbsPath, bis, uuidBehavior);
+                session.save();
+            }
+            else
+            {
+                Workspace workspace = session.getWorkspace();
+                workspace.importXML(parentAbsPath, bis, uuidBehavior);
+            }
+        }
+        catch (Exception e) 
+        {
+            throw new BuildException(e);
+        }
+        finally
+        {
+            if (bis != null)
+            {
+                try
+                {
+                    bis.close();
+                }
+                catch (Exception ignore)
+                {
+                }
+            }
+            
+            if (is != null)
+            {
+                try
+                {
+                    is.close();
+                }
+                catch (Exception ignore)
+                {
+                }
+            }
+            
+            if (session != null)
+            {
+                try
+                {
+                    session.logout();
+                }
+                catch (Exception ignore)
+                {
+                }
+            }
+        }
+    }
+}

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/Import.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-tools/src/main/java/org/apache/portals/applications/content/tools/ant/Import.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml Wed May 19 10:57:15 2010
@@ -0,0 +1,195 @@
+<?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>
+
+  <!-- POM Identification -->
+  <parent>
+    <groupId>org.apache.portals.applications</groupId>
+    <artifactId>apa-content</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apa-content-webapp</artifactId>
+  <packaging>war</packaging>
+  <name>Apache Portals Applications Content Web Application</name>
+  <description>Content Portlet Application Web Application</description>
+
+  <dependencies>
+    
+    <dependency>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-content-portlet</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-content-tools</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-gems</artifactId>
+      <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>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.hippoecm</groupId>
+      <artifactId>hippo-ecm-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.hippoecm</groupId>
+      <artifactId>hippo-ecm-repository-connector</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.onehippo.ecm.hst</groupId>
+      <artifactId>hst-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.onehippo.ecm.hst</groupId>
+      <artifactId>hst-commons</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.onehippo.ecm.hst.components</groupId>
+      <artifactId>hst-session-pool</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.onehippo.ecm.hst</groupId>
+      <artifactId>hst-content-beans</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.onehippo.ecm.hst.testsuite.sandbox</groupId>
+      <artifactId>hst-ocm</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+  </dependencies>
+  
+  <build>
+    
+    <finalName>apa-content</finalName>
+    
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <attach>false</attach>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- only include this in top level project poms -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!--
+          workaround for war processing of m-r-r-plugin causing the generated
+          NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF
+        -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+              <attached>false</attached>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+  </build>
+  
+  <profiles>
+    <profile>
+      <id>rat</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <configuration>
+              <excludes combine.children="append">
+                <exclude>src/main/webapp/META-INF/SLF4J-LICENSE</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+</project>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml Wed May 19 10:57:15 2010
@@ -0,0 +1,73 @@
+<?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.
+-->
+<Context crossContext="true">
+  
+  <!-- Simple Jackrabbit RMI based repository resource -->
+  <!--
+  <Resource name="jcr/repository" auth="Container"
+            type="javax.jcr.Repository"
+            factory="org.apache.portals.applications.content.jndi.RepositoryObjectFactory"
+            repositoryUrl="rmi://127.0.0.1:1099/hipporepository"
+  />
+  -->
+  
+  <!-- HST-2 Session Pooling Repository resource -->
+  <Resource name="jcr/repository" auth="Container"
+            type="javax.jcr.Repository"
+            factory="org.hippoecm.hst.core.jcr.pool.MultiplePoolingRepositoryFactory"
+            repositoryAddress="rmi://127.0.0.1:1099/hipporepository, rmi://127.0.0.1:1099/hipporepository"
+            defaultCredentialsUserID="editor, admin"
+            defaultCredentialsPassword="editor, admin"
+            readOnly="false, false"
+            maxActive="40, 40"
+            maxIdle="10, 10"
+            initialSize="0, 0"
+            maxWait="10000, 10000"
+            testOnBorrow="true, true"
+            testOnReturn="false, false"
+            testWhileIdle="false, false"
+            timeBetweenEvictionRunsMillis="60000, 60000"
+            numTestsPerEvictionRun="1, 1"
+            minEvictableIdleTimeMillis="60000, 60000"
+            refreshOnPassivate="true, true" 
+  />
+  
+  <!-- Simple Jackrabbit OCM Provider resource -->
+  <!--
+  <Resource name="jcr/ocmprovider" auth="Container"
+            type="javax.jcr.Repository"
+            factory="org.apache.portals.applications.content.jndi.ObjectContentManagerProviderObjectFactory"
+            annotatedClassNames="
+                                org.apache.portals.applications.content.demo.beans.HtmlBodyContent
+                                org.apache.portals.applications.content.demo.beans.TextPage
+                                org.apache.portals.applications.content.demo.beans.NewsItem
+                                "
+  />
+  -->
+  
+  <!-- HST-2 OCM Provider resource -->
+  <Resource name="jcr/ocmprovider" auth="Container"
+            type="javax.jcr.Repository"
+            factory="org.apache.portals.applications.content.jndi.ObjectContentManagerProviderObjectFactory"
+            providerClassName="org.hippoecm.hst.jackrabbit.ocm.jndi.DefaultObjectContentManagerProvider"
+            annotatedClassNames="
+                                org.apache.portals.applications.content.demo.beans.HtmlBodyContent
+                                org.apache.portals.applications.content.demo.beans.TextPage
+                                org.apache.portals.applications.content.demo.beans.NewsItem
+                                "
+  />
+  
+</Context>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/META-INF/context.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/classes/log4j.properties?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/classes/log4j.properties (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/classes/log4j.properties Wed May 19 10:57:15 2010
@@ -0,0 +1,57 @@
+# 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.
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#
+# If we don't know the logging facility, put it into the pa.log
+# 
+#
+log4j.rootLogger = ERROR, pa
+
+log4j.category.org.apache.portals.applications.content = DEBUG, pa
+log4j.additivity.org.apache.portals.applications.content = false
+
+log4j.category.org.apache.jackrabbit.ocm.manager = DEBUG, ocm
+log4j.additivity.org.apache.jackrabbit.ocm.manager = false
+
+########################################################################
+#
+# Logfile definitions
+#
+########################################################################
+
+#
+# content.log
+#
+log4j.appender.pa = org.apache.log4j.FileAppender
+log4j.appender.pa.file = ${org.apache.portals.logdir}/content.log
+log4j.appender.pa.layout = org.apache.log4j.PatternLayout
+log4j.appender.pa.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.pa.append = false
+
+#
+# content-ocm.log
+#
+log4j.appender.ocm = org.apache.log4j.FileAppender
+log4j.appender.ocm.file = ${org.apache.portals.logdir}/content-ocm.log
+log4j.appender.ocm.layout = org.apache.log4j.PatternLayout
+log4j.appender.ocm.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.ocm.append = false

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml Wed May 19 10:57:15 2010
@@ -0,0 +1,366 @@
+<?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.
+-->
+<portlet-app id='content'
+              xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" 
+              version="2.0" 
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+
+  <portlet id="GenericContentPortlet">
+    <description>Generic Content Portlet</description>
+    <portlet-name>GenericContentPortlet</portlet-name>
+    <display-name>Generic Content</display-name>
+    <portlet-class>org.apache.portals.applications.content.GenericContentPortlet</portlet-class>
+    <init-param>
+      <name>ViewPage</name>
+      <value>/WEB-INF/view/generic-content-view.jsp</value>
+    </init-param>
+    <init-param>
+      <name>EditPage</name>
+      <value>/WEB-INF/view/generic-content-edit.jsp</value>
+    </init-param>
+    <init-param>
+      <name>HelpPage</name>
+      <value>/WEB-INF/view/generic-content-help.jsp</value>
+    </init-param>
+    <expiration-cache>0</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <resource-bundle>org.apache.portals.applications.content.resources.GenericContentPortlet</resource-bundle>
+    <portlet-info>
+      <title>Generic Content</title>
+      <short-title>Generic Content</short-title>
+      <keywords>content</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>contentPath</name>
+        <value>/content/documents/en/home/home/home</value>
+      </preference>
+    </portlet-preferences>
+  </portlet>
+  
+  <portlet id="GenericQueryContentPortlet">
+    <description>Generic Query Content Portlet</description>
+    <portlet-name>GenericQueryContentPortlet</portlet-name>
+    <display-name>Generic Query Content</display-name>
+    <portlet-class>org.apache.portals.applications.content.GenericQueryContentPortlet</portlet-class>
+    <init-param>
+      <name>ViewPage</name>
+      <value>/WEB-INF/view/generic-query-content-view.jsp</value>
+    </init-param>
+    <init-param>
+      <name>EditPage</name>
+      <value>/WEB-INF/view/generic-query-content-edit.jsp</value>
+    </init-param>
+    <init-param>
+      <name>HelpPage</name>
+      <value>/WEB-INF/view/generic-query-content-help.jsp</value>
+    </init-param>
+    <expiration-cache>0</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <resource-bundle>org.apache.portals.applications.content.resources.GenericQueryContentPortlet</resource-bundle>
+    <portlet-info>
+      <title>Generic Query Content</title>
+      <short-title>Generic Query Content</short-title>
+      <keywords>content,query</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>contentPath</name>
+        <value>/content/documents/en//</value>
+      </preference>
+      <preference>
+        <name>contentUrlBase</name>
+        <value>/content/documents/en</value>
+      </preference>
+      <preference>
+        <name>queryClass</name>
+        <value>org.apache.portals.applications.content.demo.beans.TextPage</value>
+      </preference>
+      <preference>
+        <name>pageSize</name>
+        <value>10</value>
+      </preference>
+      <preference>
+        <name>queryOrderByClause</name>
+        <value>@onehippo:documentdate descending</value>
+      </preference>
+    </portlet-preferences>
+  </portlet>
+  
+  <portlet id="GenericSearchQueryContentPortlet">
+    <description>Generic Search Query Content Portlet</description>
+    <portlet-name>Generic Search QueryContentPortlet</portlet-name>
+    <display-name>Generic Search Query Content</display-name>
+    <portlet-class>org.apache.portals.applications.content.GenericSearchQueryContentPortlet</portlet-class>
+    <init-param>
+      <name>ViewPage</name>
+      <value>/WEB-INF/view/generic-search-query-content-view.jsp</value>
+    </init-param>
+    <init-param>
+      <name>EditPage</name>
+      <value>/WEB-INF/view/generic-search-query-content-edit.jsp</value>
+    </init-param>
+    <init-param>
+      <name>HelpPage</name>
+      <value>/WEB-INF/view/generic-search-query-content-help.jsp</value>
+    </init-param>
+    <expiration-cache>0</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <resource-bundle>org.apache.portals.applications.content.resources.GenericSearchQueryContentPortlet</resource-bundle>
+    <portlet-info>
+      <title>Generic Search Query Content</title>
+      <short-title>Generic Search Query Content</short-title>
+      <keywords>content,search,query</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>contentPath</name>
+        <value>/content/documents/en//</value>
+      </preference>
+      <preference>
+        <name>contentUrlBase</name>
+        <value>/content/documents/en</value>
+      </preference>
+      <preference>
+        <name>queryClass</name>
+        <value>org.apache.portals.applications.content.demo.beans.TextPage</value>
+      </preference>
+      <preference>
+        <name>pageSize</name>
+        <value>10</value>
+      </preference>
+      <preference>
+        <name>queryOrderByClause</name>
+        <value>@jcr:score descending</value>
+      </preference>
+    </portlet-preferences>
+  </portlet>
+  
+  <portlet id="SimpleSearchQueryContentPortlet">
+    <description>Simple Search Query Content Portlet</description>
+    <portlet-name>SimpleSearchQueryContentPortlet</portlet-name>
+    <display-name>Simple Search Query Content</display-name>
+    <portlet-class>org.apache.portals.applications.content.GenericSearchQueryContentPortlet</portlet-class>
+    <init-param>
+      <name>ViewPage</name>
+      <value>/WEB-INF/view/simple-search-query-content-view.jsp</value>
+    </init-param>
+    <init-param>
+      <name>EditPage</name>
+      <value>/WEB-INF/view/simple-search-query-content-edit.jsp</value>
+    </init-param>
+    <init-param>
+      <name>HelpPage</name>
+      <value>/WEB-INF/view/simple-search-query-content-help.jsp</value>
+    </init-param>
+    <expiration-cache>0</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <resource-bundle>org.apache.portals.applications.content.resources.GenericSearchQueryContentPortlet</resource-bundle>
+    <portlet-info>
+      <title>Simple Search Query Content</title>
+      <short-title>Simple Search Query Content</short-title>
+      <keywords>content,simple,search,query</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>contentPath</name>
+        <value>//</value>
+      </preference>
+      <preference>
+        <name>contentUrlBase</name>
+        <value>/content/documents/en</value>
+      </preference>
+      <preference>
+        <name>queryLanguage</name>
+        <value>xpath</value>
+      </preference>
+      <preference>
+        <name>queryClass</name>
+        <value>org.apache.portals.applications.content.demo.beans.TextPage</value>
+      </preference>
+      <preference>
+        <name>pageSize</name>
+        <value>10</value>
+      </preference>
+      <preference>
+        <name>queryOrderByClause</name>
+        <value>@jcr:score descending</value>
+      </preference>
+    </portlet-preferences>
+  </portlet>
+  
+  <portlet>
+    <description>News Item Portlet</description>
+    <portlet-name>NewsItemPortlet</portlet-name>
+    <display-name>News Item Content</display-name>
+    <portlet-class>org.apache.portals.applications.content.demo.NewsItemPortlet</portlet-class>
+    <init-param>
+      <name>ViewPage</name>
+      <value>/WEB-INF/view/news-item-view.jsp</value>
+    </init-param>
+    <init-param>
+      <name>EditPage</name>
+      <value>/WEB-INF/view/generic-content-edit.jsp</value>
+    </init-param>
+    <init-param>
+      <name>HelpPage</name>
+      <value>/WEB-INF/view/generic-content-help.jsp</value>
+    </init-param>
+    <expiration-cache>0</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <resource-bundle>org.apache.portals.applications.content.demo.resources.NewsItemPortlet</resource-bundle>
+    <portlet-info>
+      <title>News Item</title>
+      <short-title>News</short-title>
+      <keywords>content,news,newsitem,item</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>contentPath</name>
+        <value>/content/documents/en/news/2008/03/bluesunrise/bluesunrise</value>
+      </preference>
+    </portlet-preferences>
+  </portlet>
+  
+  <portlet id="NewsItemQueryPortlet">
+    <description>News Item Query Portlet</description>
+    <portlet-name>NewsItemQueryPortlet</portlet-name>
+    <display-name>News Item Query</display-name>
+    <portlet-class>org.apache.portals.applications.content.GenericQueryContentPortlet</portlet-class>
+    <init-param>
+      <name>ViewPage</name>
+      <value>/WEB-INF/view/generic-query-content-view.jsp</value>
+    </init-param>
+    <init-param>
+      <name>EditPage</name>
+      <value>/WEB-INF/view/generic-query-content-edit.jsp</value>
+    </init-param>
+    <init-param>
+      <name>HelpPage</name>
+      <value>/WEB-INF/view/generic-query-content-help.jsp</value>
+    </init-param>
+    <expiration-cache>0</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <portlet-info>
+      <title>News Item Query Portlet</title>
+      <short-title>News Item Query</short-title>
+      <keywords>news,content,query</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>contentPath</name>
+        <value>/content/documents/en/news//</value>
+      </preference>
+      <preference>
+        <name>contentUrlBase</name>
+        <value>/content/documents/en</value>
+      </preference>
+      <preference>
+        <name>queryClass</name>
+        <value>org.apache.portals.applications.content.demo.beans.NewsItem</value>
+      </preference>
+      <preference>
+        <name>pageSize</name>
+        <value>10</value>
+      </preference>
+      <preference>
+        <name>queryOrderByClause</name>
+        <value>@onehippo:documentdate descending</value>
+      </preference>
+    </portlet-preferences>
+  </portlet>
+  
+  <custom-portlet-mode>
+    <description>Custom About Mode</description>
+    <portlet-mode>about</portlet-mode>
+  </custom-portlet-mode>
+  <custom-portlet-mode>
+    <description>Custom Config Mode</description>
+    <portlet-mode>config</portlet-mode>
+  </custom-portlet-mode>
+  <custom-portlet-mode>
+    <description>Custom Edit_defaults Mode</description>
+    <portlet-mode>edit_defaults</portlet-mode>
+  </custom-portlet-mode>
+  <custom-portlet-mode>
+    <description>Custom Preview Mode</description>
+    <portlet-mode>preview</portlet-mode>
+  </custom-portlet-mode>
+  <custom-portlet-mode>
+    <description>Custom Print Mode</description>
+    <portlet-mode>print</portlet-mode>
+  </custom-portlet-mode>
+  
+  <custom-window-state>
+    <!--
+      the custom "popup" window state is mapped to the Jetspeed-2 solo" window
+      state in jetspeed-portlet.xml
+    -->
+    <description>a Custom Popup State</description>
+    <window-state>popup</window-state>
+  </custom-window-state>
+
+  <user-attribute>
+    <description>User Given Name</description>
+    <name>user.name.given</name>
+  </user-attribute>
+  <user-attribute>
+    <description>User Last Name</description>
+    <name>user.name.family</name>
+  </user-attribute>
+  <user-attribute>
+    <description>User eMail</description>
+    <name>user.home-info.online.email</name>
+  </user-attribute>
+
+</portlet-app>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-edit.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-edit.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-edit.jsp Wed May 19 10:57:15 2010
@@ -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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<form method="POST" action="<portlet:actionURL/>">
+  <table>
+    <tr>
+      <td class="portlet-section-body">Content Path:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.contentPath" size="40" value="${renderRequest.preferences.map['contentPath'][0]}" />
+    </tr>
+    <tr>
+      <td colspan="2" class="portlet-section-body">
+        <input type="hidden" name="preference.action" value="store" />
+        <input type="submit" value="Save" />
+        <input type="reset" value="Reset" />
+      </td>
+    </tr>
+  </table>
+</form>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-edit.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-help.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-help.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-help.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-help.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,25 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<h1>Content help page</h1>
+<hr/>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-help.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-view.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-view.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-view.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,43 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<h1>Content page</h1>
+<hr/>
+<table>
+  <tr>
+    <th>Title:</th>
+    <td>${contentBean.title}</td>
+  </tr>
+  <tr>
+    <th>Date:</th>
+    <td>${contentBean.documentDate}</td>
+  </tr>
+  <tr>
+    <th>Introduction:</th>
+    <td>${contentBean.introduction}</td>
+  </tr>
+</table>
+
+<hr/>
+
+${contentBean.body.content}

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-content-view.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-edit.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-edit.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-edit.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,54 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<form method="POST" action="<portlet:actionURL/>">
+  <table>
+    <tr>
+      <td class="portlet-section-body">Content Base Path:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.contentPath" size="40" value="${renderRequest.preferences.map['contentPath'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Content URL Base:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.contentUrlBase" size="40" value="${renderRequest.preferences.map['contentUrlBase'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Query Class:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.queryClass" size="40" value="${renderRequest.preferences.map['queryClass'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Page Size:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.pageSize" size="40" value="${renderRequest.preferences.map['pageSize'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Order-by clause:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.queryOrderByClause" size="40" value="${renderRequest.preferences.map['queryOrderByClause'][0]}" />
+    </tr>
+    <tr>
+      <td colspan="2" class="portlet-section-body">
+        <input type="hidden" name="preference.action" value="store" />
+        <input type="submit" value="Save" />
+        <input type="reset" value="Reset" />
+      </td>
+    </tr>
+  </table>
+</form>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-edit.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-help.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-help.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-help.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-help.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,25 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<h1>Content query help page</h1>
+<hr/>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-help.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-view.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-view.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-view.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,61 @@
+<%--
+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.
+--%>
+<%@ page import="org.apache.jetspeed.request.RequestContext"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="c_rt" uri="http://java.sun.com/jstl/core_rt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
+<c:set var="portalContextPath" value="${requestContext.request.contextPath}" />
+<c:if test="${empty portalContextPath}">
+  <c:set var="portalContextPath" value="/"/>
+</c:if>
+<c:set var="portalServletPath" value="${requestContext.request.servletPath}" />
+
+<h1>Content query result</h1>
+<hr/>
+
+<c:forEach var="contentItem" items="${contentBean}">
+<h3><a href="${portalContextPath}${portalServletPath}/content${fn:substringAfter(contentItem.path, contentUrlBase)}">${contentItem.title}</a></h3>
+<div align="right">(${contentItem.documentDate})</div>
+<div>${contentItem.introduction}</div>
+<p>&nbsp;</p>
+</c:forEach>
+
+<hr/>
+
+Pages: 
+<c:forEach begin="1" end="${pageCount}" var="index">
+  &nbsp;
+  <c:choose>
+    <c:when test="${index == pageIndex}">
+      ${index}
+    </c:when>
+    <c:otherwise>
+      <portlet:renderURL var="pageURL">
+        <portlet:param name="page" value="${index}"/>
+      </portlet:renderURL>
+      <a href="${pageURL}">${index}</a>
+    </c:otherwise>
+  </c:choose>
+  &nbsp;
+</c:forEach>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-query-content-view.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-edit.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-edit.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-edit.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,54 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<form method="POST" action="<portlet:actionURL/>">
+  <table>
+    <tr>
+      <td class="portlet-section-body">Content Base Path:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.contentPath" size="40" value="${renderRequest.preferences.map['contentPath'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Content URL Base:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.contentUrlBase" size="40" value="${renderRequest.preferences.map['contentUrlBase'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Query Class:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.queryClass" size="40" value="${renderRequest.preferences.map['queryClass'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Page Size:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.pageSize" size="40" value="${renderRequest.preferences.map['pageSize'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Order-by clause:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.queryOrderByClause" size="40" value="${renderRequest.preferences.map['queryOrderByClause'][0]}" />
+    </tr>
+    <tr>
+      <td colspan="2" class="portlet-section-body">
+        <input type="hidden" name="preference.action" value="store" />
+        <input type="submit" value="Save" />
+        <input type="reset" value="Reset" />
+      </td>
+    </tr>
+  </table>
+</form>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-edit.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-help.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-help.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-help.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-help.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,25 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<h1>Content search query help page</h1>
+<hr/>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-help.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,103 @@
+<%--
+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.
+--%>
+<%@ page import="org.apache.jetspeed.request.RequestContext"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="c_rt" uri="http://java.sun.com/jstl/core_rt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
+<c:set var="portalContextPath" value="${requestContext.request.contextPath}" />
+<c:if test="${empty portalContextPath}">
+  <c:set var="portalContextPath" value="/"/>
+</c:if>
+<c:set var="portalServletPath" value="${requestContext.request.servletPath}" />
+
+<h1>Content search query</h1>
+<hr/>
+
+<form method="POST" action="<portlet:actionURL/>">
+Query:
+<input type="text" name="query" value="${query}" />
+<input type="submit" name="submit" value="Search"/>
+<br/>
+Search bean property:
+<select name="queryNode">
+  <option value=".">Any</option>
+  <c:forTokens var="beanProp" items="title;introduction" delims=";">
+    <c:choose>
+      <c:when test="${beanProp == queryNode}">
+        <option value="${beanProp}" selected="true">${beanProp}</option>
+      </c:when>
+      <c:otherwise>
+        <option value="${beanProp}">${beanProp}</option>
+      </c:otherwise>
+    </c:choose>
+  </c:forTokens>
+</select>
+Search Operator:
+<select name="queryOperator">
+  <c:choose>
+    <c:when test="${queryOperator == 'equalto'}">
+      <option value="contains">Contains</option>
+      <option value="equalto" selected="true">Equal to</option>
+    </c:when>
+    <c:otherwise>
+	  <option value="contains">Contains</option>
+	  <option value="equalto">Equal to</option>
+    </c:otherwise>
+  </c:choose>
+</select>
+<br/>
+Additional custom JCR expression: <input type="text" name="queryJcrExpression" value="${queryJcrExpression}" />
+</form>
+
+<hr/>
+
+<c:forEach var="contentItem" items="${contentBean}">
+<h3><a href="${portalContextPath}${portalServletPath}/content${fn:substringAfter(contentItem.path, contentUrlBase)}">${contentItem.title}</a></h3>
+<div align="right">(${contentItem.documentDate})</div>
+<div>${contentItem.introduction}</div>
+<p>&nbsp;</p>
+</c:forEach>
+
+<hr/>
+
+Pages: 
+<c:forEach begin="1" end="${pageCount}" var="index">
+  &nbsp;
+  <c:choose>
+    <c:when test="${index == pageIndex}">
+      ${index}
+    </c:when>
+    <c:otherwise>
+      <portlet:renderURL var="pageURL">
+        <portlet:param name="query" value="${query}"/>
+        <portlet:param name="queryNode" value="${queryNode}"/>
+        <portlet:param name="queryOperator" value="${queryOperator}"/>
+        <portlet:param name="queryJcrExpression" value="${queryJcrExpression}"/>
+        <portlet:param name="page" value="${index}"/>
+       </portlet:renderURL>
+      <a href="${pageURL}">${index}</a>
+    </c:otherwise>
+  </c:choose>
+  &nbsp;
+</c:forEach>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/generic-search-query-content-view.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/news-item-view.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/news-item-view.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/news-item-view.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/news-item-view.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,43 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<h1>News Item</h1>
+<hr/>
+<table>
+  <tr>
+    <th>Title:</th>
+    <td>${contentBean.title}</td>
+  </tr>
+  <tr>
+    <th>Date:</th>
+    <td>${contentBean.documentDate}</td>
+  </tr>
+  <tr>
+    <th>Introduction:</th>
+    <td>${contentBean.introduction}</td>
+  </tr>
+</table>
+
+<hr/>
+
+${contentBean.body.content}

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/news-item-view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/news-item-view.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-edit.jsp
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-edit.jsp?rev=946121&view=auto
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-edit.jsp (added)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-edit.jsp Wed May 19 10:57:15 2010
@@ -0,0 +1,54 @@
+<%--
+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.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt-portlet" uri="http://portals.apache.org/applications/gems/fmt-portlet" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<fmt-portlet:setBundle/>
+
+<form method="POST" action="<portlet:actionURL/>">
+  <table>
+    <tr>
+      <td class="portlet-section-body">Content URL Base:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.contentUrlBase" size="40" value="${renderRequest.preferences.map['contentUrlBase'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Query Class:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.queryClass" size="40" value="${renderRequest.preferences.map['queryClass'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Query Language:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.queryLanguage" size="40" value="${renderRequest.preferences.map['queryLanguage'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Page Size:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.pageSize" size="40" value="${renderRequest.preferences.map['pageSize'][0]}" />
+    </tr>
+    <tr>
+      <td class="portlet-section-body">Order-by clause:</td>
+      <td class="portlet-section-body"><input type="text" name="preference.queryOrderByClause" size="40" value="${renderRequest.preferences.map['queryOrderByClause'][0]}" />
+    </tr>
+    <tr>
+      <td colspan="2" class="portlet-section-body">
+        <input type="hidden" name="preference.action" value="store" />
+        <input type="submit" value="Save" />
+        <input type="reset" value="Reset" />
+      </td>
+    </tr>
+  </table>
+</form>

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/webapp/WEB-INF/view/simple-search-query-content-edit.jsp
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message