portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725991 [24/32] - in /portals/jetspeed-2/applications/j2-admin/trunk: src/main/java/ src/main/java/org/apache/jetspeed/portlets/ src/main/java/org/apache/jetspeed/portlets/admin/ src/main/java/org/apache/jetspeed/portlets/custom/ src/main/j...
Date Fri, 12 Dec 2008 13:05:40 GMT
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java Fri Dec 12 05:05:25 2008
@@ -1,165 +1,165 @@
-/*
+/*
  * 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.jetspeed.portlets.statistics;
-
-import java.io.IOException;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.statistics.AggregateStatistics;
-import org.apache.jetspeed.statistics.InvalidCriteriaException;
-import org.apache.jetspeed.statistics.PortalStatistics;
-import org.apache.jetspeed.statistics.StatisticsQueryCriteria;
-import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
-import org.apache.velocity.context.Context;
-
-/**
- * Statistics Portlet
- * 
- * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
- * @version $Id: $
- */
-public class StatisticsPortlet extends GenericVelocityPortlet
-{
-
-    private PortalStatistics statistics;
-
-    private static final String SESSION_CRITERIA = "criteria";
-
-    private static final String SESSION_RESULTS = "results";
-
-    private static final String SESSION_TOTALSESSIONS = "totalsessions";
-
-    /* CLF logger */
-    protected final Log logger = LogFactory.getLog(this.getClass());
-
-    public void init(PortletConfig config) throws PortletException
-    {
-        super.init(config);
-        PortletContext context = getPortletContext();
-        statistics = (PortalStatistics) context
-                .getAttribute(CommonPortletServices.CPS_PORTAL_STATISTICS);
-        if (statistics == null)
-                throw new PortletException(
-                        "Could not get instance of portal statistics component");
-    }
-
-    public void doView(RenderRequest request, RenderResponse response)
-            throws PortletException, IOException
-    {
-        Context velocityContext = getContext(request);
-        PortletSession session = request.getPortletSession();
-
-        StatisticsQueryCriteria sqc = (StatisticsQueryCriteria) session
-                .getAttribute(SESSION_CRITERIA);
-        AggregateStatistics stats = (AggregateStatistics) session
-                .getAttribute(SESSION_RESULTS);
-        if (stats == null)
-        {
-            if (sqc == null)
-            {
-                // if we get here, we're on the first startup.
-                sqc = statistics.createStatisticsQueryCriteria();
-                sqc.setQueryType(PortalStatistics.QUERY_TYPE_PORTLET);
-                sqc.setTimePeriod("1");
-                sqc.setListsize("5");
-                sqc.setSorttype("count");
-                sqc.setSortorder("desc");
-                session.setAttribute(SESSION_CRITERIA, sqc);
-
-                try
-                {
-                    statistics.forceFlush();
-                    stats = statistics.queryStatistics(sqc);
-                } catch (InvalidCriteriaException e)
-                {
-                    logger.warn("unable to complete a statistics query ", e);
-                }
-                session.setAttribute(SESSION_RESULTS, stats);
-
-            }
-        }
-        velocityContext.put(SESSION_TOTALSESSIONS, ""
-                + statistics.getNumberOfCurrentUsers());
-        velocityContext.put(SESSION_RESULTS, stats);
-        velocityContext.put(SESSION_CRITERIA, sqc);
-        super.doView(request, response);
-    }
-
-    public void processAction(ActionRequest request,
-            ActionResponse actionResponse) throws PortletException, IOException
-    {
-        PortletSession session = request.getPortletSession();
-        StatisticsQueryCriteria criteria = statistics.createStatisticsQueryCriteria();
-        
-        String user = request.getParameter("user");
-        criteria.setUser(user);
-        String timeperiod = request.getParameter("timeperiod");
-        if (timeperiod == null)
-        {
-            timeperiod = "all";
-        }
-        
-        String listsizeStr = request.getParameter("listsize");
-        if(listsizeStr == null) 
-        {
-            listsizeStr = "5";
-        } else 
-        {
-           try
-            {
-                Integer.parseInt(listsizeStr);
-            } catch (NumberFormatException e)
-            {
-                // if we can't parse it.. just make it 5
-                listsizeStr = "5";
-            }
-        }
-        criteria.setListsize(listsizeStr);
-        criteria.setSorttype("count");
-        criteria.setSortorder("desc");
-
-        criteria.setTimePeriod(timeperiod);
-        String queryType = request.getParameter("queryType");
-
-        criteria.setQueryType(queryType);
-        AggregateStatistics stats = statistics.getDefaultEmptyAggregateStatistics();
-        try
-        {
-            statistics.forceFlush();
-            stats = statistics.queryStatistics(criteria);
-        } catch (InvalidCriteriaException e)
-        {
-            logger.warn("unable to complete a statistics query ", e);
-        }
-        // save this to session for later display/edit
-        session.setAttribute(SESSION_CRITERIA, criteria);
-        session.setAttribute(SESSION_RESULTS, stats);
-
-    }
-
-}
+ * 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.portlets.statistics;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.statistics.AggregateStatistics;
+import org.apache.jetspeed.statistics.InvalidCriteriaException;
+import org.apache.jetspeed.statistics.PortalStatistics;
+import org.apache.jetspeed.statistics.StatisticsQueryCriteria;
+import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
+import org.apache.velocity.context.Context;
+
+/**
+ * Statistics Portlet
+ * 
+ * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
+ * @version $Id: $
+ */
+public class StatisticsPortlet extends GenericVelocityPortlet
+{
+
+    private PortalStatistics statistics;
+
+    private static final String SESSION_CRITERIA = "criteria";
+
+    private static final String SESSION_RESULTS = "results";
+
+    private static final String SESSION_TOTALSESSIONS = "totalsessions";
+
+    /* CLF logger */
+    protected final Log logger = LogFactory.getLog(this.getClass());
+
+    public void init(PortletConfig config) throws PortletException
+    {
+        super.init(config);
+        PortletContext context = getPortletContext();
+        statistics = (PortalStatistics) context
+                .getAttribute(CommonPortletServices.CPS_PORTAL_STATISTICS);
+        if (statistics == null)
+                throw new PortletException(
+                        "Could not get instance of portal statistics component");
+    }
+
+    public void doView(RenderRequest request, RenderResponse response)
+            throws PortletException, IOException
+    {
+        Context velocityContext = getContext(request);
+        PortletSession session = request.getPortletSession();
+
+        StatisticsQueryCriteria sqc = (StatisticsQueryCriteria) session
+                .getAttribute(SESSION_CRITERIA);
+        AggregateStatistics stats = (AggregateStatistics) session
+                .getAttribute(SESSION_RESULTS);
+        if (stats == null)
+        {
+            if (sqc == null)
+            {
+                // if we get here, we're on the first startup.
+                sqc = statistics.createStatisticsQueryCriteria();
+                sqc.setQueryType(PortalStatistics.QUERY_TYPE_PORTLET);
+                sqc.setTimePeriod("1");
+                sqc.setListsize("5");
+                sqc.setSorttype("count");
+                sqc.setSortorder("desc");
+                session.setAttribute(SESSION_CRITERIA, sqc);
+
+                try
+                {
+                    statistics.forceFlush();
+                    stats = statistics.queryStatistics(sqc);
+                } catch (InvalidCriteriaException e)
+                {
+                    logger.warn("unable to complete a statistics query ", e);
+                }
+                session.setAttribute(SESSION_RESULTS, stats);
+
+            }
+        }
+        velocityContext.put(SESSION_TOTALSESSIONS, ""
+                + statistics.getNumberOfCurrentUsers());
+        velocityContext.put(SESSION_RESULTS, stats);
+        velocityContext.put(SESSION_CRITERIA, sqc);
+        super.doView(request, response);
+    }
+
+    public void processAction(ActionRequest request,
+            ActionResponse actionResponse) throws PortletException, IOException
+    {
+        PortletSession session = request.getPortletSession();
+        StatisticsQueryCriteria criteria = statistics.createStatisticsQueryCriteria();
+        
+        String user = request.getParameter("user");
+        criteria.setUser(user);
+        String timeperiod = request.getParameter("timeperiod");
+        if (timeperiod == null)
+        {
+            timeperiod = "all";
+        }
+        
+        String listsizeStr = request.getParameter("listsize");
+        if(listsizeStr == null) 
+        {
+            listsizeStr = "5";
+        } else 
+        {
+           try
+            {
+                Integer.parseInt(listsizeStr);
+            } catch (NumberFormatException e)
+            {
+                // if we can't parse it.. just make it 5
+                listsizeStr = "5";
+            }
+        }
+        criteria.setListsize(listsizeStr);
+        criteria.setSorttype("count");
+        criteria.setSortorder("desc");
+
+        criteria.setTimePeriod(timeperiod);
+        String queryType = request.getParameter("queryType");
+
+        criteria.setQueryType(queryType);
+        AggregateStatistics stats = statistics.getDefaultEmptyAggregateStatistics();
+        try
+        {
+            statistics.forceFlush();
+            stats = statistics.queryStatistics(criteria);
+        } catch (InvalidCriteriaException e)
+        {
+            logger.warn("unable to complete a statistics query ", e);
+        }
+        // save this to session for later display/edit
+        session.setAttribute(SESSION_CRITERIA, criteria);
+        session.setAttribute(SESSION_RESULTS, stats);
+
+    }
+
+}

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java Fri Dec 12 05:05:25 2008
@@ -1,91 +1,91 @@
-/*
- * 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.jetspeed.portlets.wicket;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.UrlResourceStream;
-import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
-
-/**
- * Abstract Admin Wicket Application to load customized templates from /WEB-INF/templates/.
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: $
- */
-public abstract class AbstractAdminWebApplication extends WebApplication
-{
-
-	public abstract Class getHomePage();
-    
-	protected void init()
-	{
-        super.init();
-
-		// instruct the application to use our custom resource stream locator
-		getResourceSettings().setResourceStreamLocator(new TemplatesResourceStreamLocator());
-	}
-    
-    private class TemplatesResourceStreamLocator extends ResourceStreamLocator
-    {
-        
-        protected String templatesPath = "/WEB-INF/templates/";
-
-        public void setTemplatesPath(String templatesPath)
-        {
-            this.templatesPath = templatesPath;
-        }
-        
-        public String getTemplatesPath()
-        {
-            return this.templatesPath;
-        }
-
-        /**
-         * @see org.apache.wicket.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class,
-         *      java.lang.String)
-         */
-        public IResourceStream locate(Class clazz, String path)
-        {
-            String location = this.templatesPath + path;
-            
-            try
-            {
-                // try to load the resource from the web context
-                URL url = getServletContext().getResource(location);
-                
-                if (url != null)
-                {
-                    return new UrlResourceStream(url);
-                }
-            }
-            catch (MalformedURLException e)
-            {
-                throw new WicketRuntimeException(e);
-            }
-
-            // resource not found; fall back on class loading
-            return super.locate(clazz, path);
-        }
-
-    }
-
-}
+/*
+ * 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.jetspeed.portlets.wicket;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.UrlResourceStream;
+import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
+
+/**
+ * Abstract Admin Wicket Application to load customized templates from /WEB-INF/templates/.
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: $
+ */
+public abstract class AbstractAdminWebApplication extends WebApplication
+{
+
+	public abstract Class getHomePage();
+    
+	protected void init()
+	{
+        super.init();
+
+		// instruct the application to use our custom resource stream locator
+		getResourceSettings().setResourceStreamLocator(new TemplatesResourceStreamLocator());
+	}
+    
+    private class TemplatesResourceStreamLocator extends ResourceStreamLocator
+    {
+        
+        protected String templatesPath = "/WEB-INF/templates/";
+
+        public void setTemplatesPath(String templatesPath)
+        {
+            this.templatesPath = templatesPath;
+        }
+        
+        public String getTemplatesPath()
+        {
+            return this.templatesPath;
+        }
+
+        /**
+         * @see org.apache.wicket.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class,
+         *      java.lang.String)
+         */
+        public IResourceStream locate(Class clazz, String path)
+        {
+            String location = this.templatesPath + path;
+            
+            try
+            {
+                // try to load the resource from the web context
+                URL url = getServletContext().getResource(location);
+                
+                if (url != null)
+                {
+                    return new UrlResourceStream(url);
+                }
+            }
+            catch (MalformedURLException e)
+            {
+                throw new WicketRuntimeException(e);
+            }
+
+            // resource not found; fall back on class loading
+            return super.locate(clazz, path);
+        }
+
+    }
+
+}

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java Fri Dec 12 05:05:25 2008
@@ -1,98 +1,98 @@
-/*
- * 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.jetspeed.portlets.wicket;
-
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-import org.apache.jetspeed.container.InternalPortletContext;
-import org.apache.jetspeed.om.portlet.PortletApplication;
-import org.apache.wicket.protocol.http.portlet.WicketPortlet;
-import org.apache.wicket.util.string.StringList;
-
-/**
- * AdminWicketPortlet which overrides init() and processRequest() to pass cps: components to Wicket pages.
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: $
- */
-public class AdminWicketPortlet extends WicketPortlet
-{
-    public static final String INIT_PARAMS = AdminWicketPortlet.class.getName() + ".initParams";
-    public static final String JETSPEED_PA_IDENTIFIER = "JetspeedPAName";
-    public static final String SERVICE_COMPONENT_NAMES = "serviceComponentNames";
-    
-    protected String paName;
-    protected Map<String, Object> serviceComponentsMap = null;
-    protected Map<String, String> initParams = null;
-    
-    public void init(PortletConfig config) throws PortletException
-    {
-        super.init(config);
-        
-        this.initParams = new HashMap<String, String>();
-        
-        for (Enumeration paramNames = config.getInitParameterNames(); paramNames.hasMoreElements(); )
-        {
-            String paramName = (String) paramNames.nextElement();
-            String paramValue = config.getInitParameter(paramName);
-            this.initParams.put(paramName, paramValue);
-        }
-        
-        String serviceComponentNames = config.getInitParameter(SERVICE_COMPONENT_NAMES);
-        
-        if (serviceComponentNames != null)
-        {
-            StringList serviceComponentNameList = StringList.tokenize(serviceComponentNames);
-            this.serviceComponentsMap = new HashMap<String, Object>();
-            
-            for (int i = serviceComponentNameList.size() - 1; i >= 0; i--)
-            {
-                String serviceComponentName = serviceComponentNameList.get(i).trim();
-                
-                if (!"".equals(serviceComponentName))
-                {
-                    Object component = getPortletContext().getAttribute(serviceComponentName);
-                    this.serviceComponentsMap.put(serviceComponentName, component);
-                }
-            }
-        }
-        
-        this.paName = ((PortletApplication) ((InternalPortletContext) config.getPortletContext()).getPortletApplicationDefinition()).getName();
-    }
-    
-	protected void processRequest(PortletRequest request, PortletResponse response, String requestType, String pageType) throws PortletException, IOException
-    {
-        request.setAttribute(JETSPEED_PA_IDENTIFIER, this.paName);
-        request.setAttribute(INIT_PARAMS, this.initParams);
-        
-        for (Map.Entry<String, Object> entry : this.serviceComponentsMap.entrySet())
-        {
-            request.setAttribute(entry.getKey(), entry.getValue());
-        }
-        
-        super.processRequest(request, response, requestType, pageType);
-    }
-    
+/*
+ * 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.jetspeed.portlets.wicket;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+import org.apache.jetspeed.container.InternalPortletContext;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.wicket.protocol.http.portlet.WicketPortlet;
+import org.apache.wicket.util.string.StringList;
+
+/**
+ * AdminWicketPortlet which overrides init() and processRequest() to pass cps: components to Wicket pages.
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: $
+ */
+public class AdminWicketPortlet extends WicketPortlet
+{
+    public static final String INIT_PARAMS = AdminWicketPortlet.class.getName() + ".initParams";
+    public static final String JETSPEED_PA_IDENTIFIER = "JetspeedPAName";
+    public static final String SERVICE_COMPONENT_NAMES = "serviceComponentNames";
+    
+    protected String paName;
+    protected Map<String, Object> serviceComponentsMap = null;
+    protected Map<String, String> initParams = null;
+    
+    public void init(PortletConfig config) throws PortletException
+    {
+        super.init(config);
+        
+        this.initParams = new HashMap<String, String>();
+        
+        for (Enumeration paramNames = config.getInitParameterNames(); paramNames.hasMoreElements(); )
+        {
+            String paramName = (String) paramNames.nextElement();
+            String paramValue = config.getInitParameter(paramName);
+            this.initParams.put(paramName, paramValue);
+        }
+        
+        String serviceComponentNames = config.getInitParameter(SERVICE_COMPONENT_NAMES);
+        
+        if (serviceComponentNames != null)
+        {
+            StringList serviceComponentNameList = StringList.tokenize(serviceComponentNames);
+            this.serviceComponentsMap = new HashMap<String, Object>();
+            
+            for (int i = serviceComponentNameList.size() - 1; i >= 0; i--)
+            {
+                String serviceComponentName = serviceComponentNameList.get(i).trim();
+                
+                if (!"".equals(serviceComponentName))
+                {
+                    Object component = getPortletContext().getAttribute(serviceComponentName);
+                    this.serviceComponentsMap.put(serviceComponentName, component);
+                }
+            }
+        }
+        
+        this.paName = ((PortletApplication) ((InternalPortletContext) config.getPortletContext()).getPortletApplicationDefinition()).getName();
+    }
+    
+	protected void processRequest(PortletRequest request, PortletResponse response, String requestType, String pageType) throws PortletException, IOException
+    {
+        request.setAttribute(JETSPEED_PA_IDENTIFIER, this.paName);
+        request.setAttribute(INIT_PARAMS, this.initParams);
+        
+        for (Map.Entry<String, Object> entry : this.serviceComponentsMap.entrySet())
+        {
+            request.setAttribute(entry.getKey(), entry.getValue());
+        }
+        
+        super.processRequest(request, response, requestType, pageType);
+    }
+    
 }
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn$CheckBoxPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn%24CheckBoxPanel.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn$CheckBoxPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn$CheckBoxPanel.html Fri Dec 12 05:05:25 2008
@@ -1,25 +1,25 @@
-<?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.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" >
-
-    <wicket:panel>
-        <input type="checkbox" wicket:id="checkBox" />
-    </wicket:panel>
-    
+<?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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+
+    <wicket:panel>
+        <input type="checkbox" wicket:id="checkBox" />
+    </wicket:panel>
+    
 </html>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn$CheckBoxPanel.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java Fri Dec 12 05:05:25 2008
@@ -1,71 +1,71 @@
-/*
- * 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.jetspeed.portlets.wicket.component;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-
-/**
- * CheckBoxPropertyColumn to show selection column with checkbox.
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: $
- */
-public class CheckBoxPropertyColumn extends PropertyColumn 
-{
-	private static final long serialVersionUID = 1L;
-    
-    protected String cellWidth = "1%";
-
-    public CheckBoxPropertyColumn(IModel displayModel, String propertyExpressions) 
-    {
-        super(displayModel, propertyExpressions);
-    }
-        
-    public void setCellWidth(String cellWidth)
-    {
-        this.cellWidth = cellWidth;
-    }
-    
-    public String getCellWidth()
-    {
-        return this.cellWidth;
-    }
-
-    public void populateItem(Item item, String componentId, IModel model) 
-    {
-        item.add(new AttributeModifier("width", true, new Model(getCellWidth())));
-        item.add(new CheckBoxPanel(item, componentId, model));
-    }
-    
-    public class CheckBoxPanel extends Panel 
-    {
-        public CheckBoxPanel(final Item item, final String componentId, final IModel model) 
-        {
-            super(componentId);
-            CheckBox checkBox = new CheckBox("checkBox", new PropertyModel(model.getObject(), getPropertyExpression()));
-            add(checkBox);
-        }
-    }
-
+/*
+ * 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.jetspeed.portlets.wicket.component;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+
+/**
+ * CheckBoxPropertyColumn to show selection column with checkbox.
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: $
+ */
+public class CheckBoxPropertyColumn extends PropertyColumn 
+{
+	private static final long serialVersionUID = 1L;
+    
+    protected String cellWidth = "1%";
+
+    public CheckBoxPropertyColumn(IModel displayModel, String propertyExpressions) 
+    {
+        super(displayModel, propertyExpressions);
+    }
+        
+    public void setCellWidth(String cellWidth)
+    {
+        this.cellWidth = cellWidth;
+    }
+    
+    public String getCellWidth()
+    {
+        return this.cellWidth;
+    }
+
+    public void populateItem(Item item, String componentId, IModel model) 
+    {
+        item.add(new AttributeModifier("width", true, new Model(getCellWidth())));
+        item.add(new CheckBoxPanel(item, componentId, model));
+    }
+    
+    public class CheckBoxPanel extends Panel 
+    {
+        public CheckBoxPanel(final Item item, final String componentId, final IModel model) 
+        {
+            super(componentId);
+            CheckBox checkBox = new CheckBox("checkBox", new PropertyModel(model.getObject(), getPropertyExpression()));
+            add(checkBox);
+        }
+    }
+
 }
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn$LinkPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn%24LinkPanel.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn$LinkPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn$LinkPanel.html Fri Dec 12 05:05:25 2008
@@ -1,25 +1,25 @@
-<?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.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" >
-
-    <wicket:panel>
-        <a href="#" wicket:id="link"><span wicket:id="label">link</span></a>
-    </wicket:panel>
-    
+<?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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+
+    <wicket:panel>
+        <a href="#" wicket:id="link"><span wicket:id="label">link</span></a>
+    </wicket:panel>
+    
 </html>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn$LinkPanel.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java Fri Dec 12 05:05:25 2008
@@ -1,98 +1,98 @@
-/*
- * 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.jetspeed.portlets.wicket.component;
-
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.link.PopupSettings;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-
-/**
- * LinkPropertyColumn to show simple link column.
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: $
- */
-public abstract class LinkPropertyColumn extends PropertyColumn 
-{
-	private static final long serialVersionUID = 1L;
-
-    protected PopupSettings popupSettings;
-    protected IModel labelModel;
-
-    public LinkPropertyColumn(IModel displayModel, String sortProperty, String propertyExpression, PopupSettings popupSettings) 
-    {
-        this(displayModel, sortProperty, propertyExpression);
-        this.popupSettings = popupSettings;
-    }
-
-    public LinkPropertyColumn(IModel displayModel, IModel labelModel) 
-    {
-        super(displayModel, null);
-        this.labelModel = labelModel;
-    }
-
-    public LinkPropertyColumn(IModel displayModel, String sortProperty, String propertyExpression) 
-    {
-        super(displayModel, sortProperty, propertyExpression);
-    }
-
-    public LinkPropertyColumn(IModel displayModel, String propertyExpressions) 
-    {
-        super(displayModel, propertyExpressions);
-    }
-
-    public void populateItem(Item item, String componentId, IModel model) 
-    {
-        item.add(new LinkPanel(item, componentId, model));
-    }
-
-    public abstract void onClick(Item item, String componentId, IModel model);
-
-    public class LinkPanel extends Panel 
-    {
-        public LinkPanel(final Item item, final String componentId, final IModel model) 
-        {
-            super(componentId);
-
-            Link link = new Link("link") 
-            {
-                public void onClick() 
-                {
-                    LinkPropertyColumn.this.onClick(item, componentId, model);
-                }
-            };
-
-            link.setPopupSettings(popupSettings);
-
-            add(link);
-
-            IModel tmpLabelModel = labelModel;
-
-            if (labelModel == null) 
-            {
-                tmpLabelModel = createLabelModel(model);
-            }
-
-            link.add(new Label("label", tmpLabelModel));
-        }
-    }
-
+/*
+ * 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.jetspeed.portlets.wicket.component;
+
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.link.PopupSettings;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+
+/**
+ * LinkPropertyColumn to show simple link column.
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: $
+ */
+public abstract class LinkPropertyColumn extends PropertyColumn 
+{
+	private static final long serialVersionUID = 1L;
+
+    protected PopupSettings popupSettings;
+    protected IModel labelModel;
+
+    public LinkPropertyColumn(IModel displayModel, String sortProperty, String propertyExpression, PopupSettings popupSettings) 
+    {
+        this(displayModel, sortProperty, propertyExpression);
+        this.popupSettings = popupSettings;
+    }
+
+    public LinkPropertyColumn(IModel displayModel, IModel labelModel) 
+    {
+        super(displayModel, null);
+        this.labelModel = labelModel;
+    }
+
+    public LinkPropertyColumn(IModel displayModel, String sortProperty, String propertyExpression) 
+    {
+        super(displayModel, sortProperty, propertyExpression);
+    }
+
+    public LinkPropertyColumn(IModel displayModel, String propertyExpressions) 
+    {
+        super(displayModel, propertyExpressions);
+    }
+
+    public void populateItem(Item item, String componentId, IModel model) 
+    {
+        item.add(new LinkPanel(item, componentId, model));
+    }
+
+    public abstract void onClick(Item item, String componentId, IModel model);
+
+    public class LinkPanel extends Panel 
+    {
+        public LinkPanel(final Item item, final String componentId, final IModel model) 
+        {
+            super(componentId);
+
+            Link link = new Link("link") 
+            {
+                public void onClick() 
+                {
+                    LinkPropertyColumn.this.onClick(item, componentId, model);
+                }
+            };
+
+            link.setPopupSettings(popupSettings);
+
+            add(link);
+
+            IModel tmpLabelModel = labelModel;
+
+            if (labelModel == null) 
+            {
+                tmpLabelModel = createLabelModel(model);
+            }
+
+            link.add(new Label("label", tmpLabelModel));
+        }
+    }
+
 }
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java Fri Dec 12 05:05:25 2008
@@ -1,61 +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.
- */
-package org.apache.jetspeed.portlets.wicket.component;
-
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.repeater.OddEvenItem;
-import org.apache.wicket.model.IModel;
-
-/**
- * PortletOddEvenItem to show rows with different colors.
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: $
- */
-public class PortletOddEvenItem extends OddEvenItem
-{
-	private static final long serialVersionUID = 1L;
-
-    private String evenClass = "portlet-section-body";
-    private String oddClass = "portlet-section-alternate";
-       
-	public PortletOddEvenItem(String id, int index, IModel model)
-	{
-		this(id, index, model, null, null);
-	}
-
-	public PortletOddEvenItem(String id, int index, IModel model, String evenClass, String oddClass)
-	{
-		super(id, index, model);
-        
-        if (evenClass != null)
-        {
-            this.evenClass = evenClass;
-        }
-        
-        if (oddClass != null)
-        {
-            this.oddClass = oddClass;
-        }
-	}
-    
-	protected void onComponentTag(ComponentTag tag)
-	{
-		super.onComponentTag(tag);
-		tag.put("class", (getIndex() % 2 == 0) ? this.oddClass : this.evenClass);
-	}
+/*
+ * 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.jetspeed.portlets.wicket.component;
+
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.repeater.OddEvenItem;
+import org.apache.wicket.model.IModel;
+
+/**
+ * PortletOddEvenItem to show rows with different colors.
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: $
+ */
+public class PortletOddEvenItem extends OddEvenItem
+{
+	private static final long serialVersionUID = 1L;
+
+    private String evenClass = "portlet-section-body";
+    private String oddClass = "portlet-section-alternate";
+       
+	public PortletOddEvenItem(String id, int index, IModel model)
+	{
+		this(id, index, model, null, null);
+	}
+
+	public PortletOddEvenItem(String id, int index, IModel model, String evenClass, String oddClass)
+	{
+		super(id, index, model);
+        
+        if (evenClass != null)
+        {
+            this.evenClass = evenClass;
+        }
+        
+        if (oddClass != null)
+        {
+            this.oddClass = oddClass;
+        }
+	}
+    
+	protected void onComponentTag(ComponentTag tag)
+	{
+		super.onComponentTag(tag);
+		tag.put("class", (getIndex() % 2 == 0) ? this.oddClass : this.evenClass);
+	}
 }
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn$ImagePanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn%24ImagePanel.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn$ImagePanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn$ImagePanel.html Fri Dec 12 05:05:25 2008
@@ -1,25 +1,25 @@
-<?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.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" >
-
-    <wicket:panel>
-        <img wicket:id="image" />
-    </wicket:panel>
-    
+<?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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+
+    <wicket:panel>
+        <img wicket:id="image" />
+    </wicket:panel>
+    
 </html>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn$ImagePanel.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java Fri Dec 12 05:05:25 2008
@@ -1,98 +1,98 @@
-/*
- * 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.jetspeed.portlets.wicket.component;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-/**
- * SelectionImagePropertyColumn to show selection column with image icons.
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: $
- */
-public abstract class SelectionImagePropertyColumn extends PropertyColumn 
-{
-	private static final long serialVersionUID = 1L;
-    
-    protected String selectedImage = "Selected.gif";
-    protected String blankImage = "Blank.gif";
-    
-    protected String cellWidth = "1%";
-
-    public SelectionImagePropertyColumn(IModel displayModel, String propertyExpressions) 
-    {
-        super(displayModel, propertyExpressions);
-    }
-    
-    public void setSelectedImage(String selectedImage)
-    {
-        this.selectedImage = selectedImage;
-    }
-    
-    public String getSelectedImage()
-    {
-        return this.selectedImage;
-    }
-    
-    public void setBlankImage(String blankImage)
-    {
-        this.blankImage = blankImage;
-    }
-    
-    public String getBlankImage()
-    {
-        return this.blankImage;
-    }
-    
-    public void setCellWidth(String cellWidth)
-    {
-        this.cellWidth = cellWidth;
-    }
-    
-    public String getCellWidth()
-    {
-        return this.cellWidth;
-    }
-
-    public void populateItem(Item item, String componentId, IModel model) 
-    {
-        item.add(new AttributeModifier("width", true, new Model(getCellWidth())));
-        item.add(new ImagePanel(item, componentId, model));
-    }
-    
-    protected boolean isSelected(Item item, String componentId, IModel model)
-    {
-        return false;
-    }
-    
-    public class ImagePanel extends Panel 
-    {
-        public ImagePanel(final Item item, final String componentId, final IModel model) 
-        {
-            super(componentId);
-            Image image = new Image("image", new Model(isSelected(item, componentId, model) ? getSelectedImage() : getBlankImage()));
-            add(image);
-        }
-    }
-
+/*
+ * 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.jetspeed.portlets.wicket.component;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+/**
+ * SelectionImagePropertyColumn to show selection column with image icons.
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: $
+ */
+public abstract class SelectionImagePropertyColumn extends PropertyColumn 
+{
+	private static final long serialVersionUID = 1L;
+    
+    protected String selectedImage = "Selected.gif";
+    protected String blankImage = "Blank.gif";
+    
+    protected String cellWidth = "1%";
+
+    public SelectionImagePropertyColumn(IModel displayModel, String propertyExpressions) 
+    {
+        super(displayModel, propertyExpressions);
+    }
+    
+    public void setSelectedImage(String selectedImage)
+    {
+        this.selectedImage = selectedImage;
+    }
+    
+    public String getSelectedImage()
+    {
+        return this.selectedImage;
+    }
+    
+    public void setBlankImage(String blankImage)
+    {
+        this.blankImage = blankImage;
+    }
+    
+    public String getBlankImage()
+    {
+        return this.blankImage;
+    }
+    
+    public void setCellWidth(String cellWidth)
+    {
+        this.cellWidth = cellWidth;
+    }
+    
+    public String getCellWidth()
+    {
+        return this.cellWidth;
+    }
+
+    public void populateItem(Item item, String componentId, IModel model) 
+    {
+        item.add(new AttributeModifier("width", true, new Model(getCellWidth())));
+        item.add(new ImagePanel(item, componentId, model));
+    }
+    
+    protected boolean isSelected(Item item, String componentId, IModel model)
+    {
+        return false;
+    }
+    
+    public class ImagePanel extends Panel 
+    {
+        public ImagePanel(final Item item, final String componentId, final IModel model) 
+        {
+            super(componentId);
+            Image image = new Image("image", new Model(isSelected(item, componentId, model) ? getSelectedImage() : getBlankImage()));
+            add(image);
+        }
+    }
+
 }
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn$TextFieldPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn%24TextFieldPanel.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn$TextFieldPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn$TextFieldPanel.html Fri Dec 12 05:05:25 2008
@@ -1,25 +1,25 @@
-<?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.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" >
-
-    <wicket:panel>
-        <input type="text" wicket:id="textField" />
-    </wicket:panel>
-    
+<?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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+
+    <wicket:panel>
+        <input type="text" wicket:id="textField" />
+    </wicket:panel>
+    
 </html>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn$TextFieldPanel.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java Fri Dec 12 05:05:25 2008
@@ -1,56 +1,56 @@
-/*
- * 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.jetspeed.portlets.wicket.component;
-
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-
-/**
- * TextFieldPropertyColumn to show selection column with textbox.
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id: $
- */
-public class TextFieldPropertyColumn extends PropertyColumn 
-{
-	private static final long serialVersionUID = 1L;
-    
-    public TextFieldPropertyColumn(IModel displayModel, String propertyExpressions) 
-    {
-        super(displayModel, propertyExpressions);
-    }
-    
-    public void populateItem(Item item, String componentId, IModel model) 
-    {
-        item.add(new TextFieldPanel(item, componentId, model));
-    }
-    
-    public class TextFieldPanel extends Panel 
-    {
-        public TextFieldPanel(final Item item, final String componentId, final IModel model) 
-        {
-            super(componentId);
-            TextField textField = new TextField("textField", new PropertyModel(model.getObject(), getPropertyExpression()));
-            add(textField);
-        }
-    }
-
+/*
+ * 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.jetspeed.portlets.wicket.component;
+
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+
+/**
+ * TextFieldPropertyColumn to show selection column with textbox.
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id: $
+ */
+public class TextFieldPropertyColumn extends PropertyColumn 
+{
+	private static final long serialVersionUID = 1L;
+    
+    public TextFieldPropertyColumn(IModel displayModel, String propertyExpressions) 
+    {
+        super(displayModel, propertyExpressions);
+    }
+    
+    public void populateItem(Item item, String componentId, IModel model) 
+    {
+        item.add(new TextFieldPanel(item, componentId, model));
+    }
+    
+    public class TextFieldPanel extends Panel 
+    {
+        public TextFieldPanel(final Item item, final String componentId, final IModel model) 
+        {
+            super(componentId);
+            TextField textField = new TextField("textField", new PropertyModel(model.getObject(), getPropertyExpression()));
+            add(textField);
+        }
+    }
+
 }
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/views.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/views.properties?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/views.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/views.properties Fri Dec 12 05:05:25 2008
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-constraintsView.class = org.springframework.web.servlet.view.velocity.VelocityView
-constraintsView.url = security/constraints/constraints-view.vm
-
-#constraintsEdit.class = org.springframework.web.servlet.view.JstlView
-#constraintsEdit.url = /WEB-INF/jsp/domTreeEdit.jsp
-
+
+constraintsView.class = org.springframework.web.servlet.view.velocity.VelocityView
+constraintsView.url = security/constraints/constraints-view.vm
+
+#constraintsEdit.class = org.springframework.web.servlet.view.JstlView
+#constraintsEdit.url = /WEB-INF/jsp/domTreeEdit.jsp
+

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/views.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/META-INF/context.xml?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/META-INF/context.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/META-INF/context.xml Fri Dec 12 05:05:25 2008
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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: context.xml 348264 2005-11-22 22:06:45Z taylor $
--->
-<Context crossContext="true"/>
+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: context.xml 348264 2005-11-22 22:06:45Z taylor $
+-->
+<Context crossContext="true"/>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/META-INF/context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/_content/BillOfRights.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/_content/BillOfRights.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/_content/BillOfRights.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/_content/BillOfRights.html Fri Dec 12 05:05:25 2008
@@ -14,94 +14,94 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-<p><center><b>THE BILL OF RIGHTS</b><br><EM>Amendments 1-10 of the Constitution</em></center>
-
-<HR>
-
-<p>The Conventions of a number of the States having, at the time of adopting the Constitution, expressed a desire, in order to prevent misconstruction or abuse of its powers, that further declaratory and restrictive clauses should be added, and as extending the ground of public confidence in the Government will best insure the beneficent ends of its institution;
-<P>
-
-Resolved, by the Senate and House of Representatives of the United States of America, in Congress assembled, two-thirds of both Houses concurring, that the following articles be proposed to the Legislatures of the several States, as amendments to the Constitution of the United States; all or any of which articles, when ratified by three-fourths of the said Legislatures, to be valid to all intents and purposes as part of the said Constitution, namely:
-
-<P><a name="1"><strong><H3>Amendment I</h3></strong></a>
-
-<P>Congress shall make no law respecting an establishment of
-religion, or prohibiting the free exercise thereof; or
-abridging the freedom of speech, or of the press; or the
-right of the people peaceably to assemble, and to petition
-the government for a redress of grievances.
-
-<P><a name="2"><strong><H3>Amendment II</h3></strong></a>
-
-<P>A well regulated militia, being necessary to the security
-of a free state, the right of the people to keep and bear
-arms, shall not be infringed.
-
-<P><a name="3"><strong><H3>Amendment III</h3></strong></a>
-
-<P>No soldier shall, in time of peace be quartered in any house,
-without the consent of the owner, nor in time of war, but
-in a manner to be prescribed by law.
-
-<P><a name="4"><strong><H3>Amendment IV</h3></strong></a>
-
-<P>The right of the people to be secure in their persons, houses,
-papers, and effects, against unreasonable searches and seizures,
-shall not be violated, and no warrants shall issue, but upon
-probable cause, supported by oath or affirmation, and
-particularly describing the place to be searched, and the
-persons or things to be seized.
-
-<P><a name="5"><strong><H3>Amendment V</h3></strong></a>
-
-<P>No person shall be held to answer for a capital, or otherwise
-infamous crime, unless on a presentment or indictment of a grand
-jury, except in cases arising in the land or naval forces,
-or in the militia, when in actual service in time of war
-or public danger; nor shall any person be subject for the
-same offense to be twice put in jeopardy of life or limb;
-nor shall be compelled in any criminal case to be a witness
-against himself, nor be deprived of life, liberty, or property,
-without due process of law; nor shall private property be
-taken for public use, without just compensation.
-
-<P><a name="6"><strong><H3>Amendment VI</h3></strong></a>
-
-<P>In all criminal prosecutions, the accused shall enjoy the right
-to a speedy and public trial, by an impartial jury of the state
-and district wherein the crime shall have been committed, which
-district shall have been previously ascertained by law, and
-to be informed of the nature and cause of the accusation;
-to be confronted with the witnesses against him; to have
-compulsory process for obtaining witnesses in his favor,
-and to have the assistance of counsel for his defense.
-
-<P><a name="7"><strong><H3>Amendment VII</h3></strong></a>
-
-<P>In suits at common law, where the value in controversy shall
-exceed twenty dollars, the right of trial by jury shall be
-preserved, and no fact tried by a jury, shall be otherwise
-reexamined in any court of the United States, than according
-to the rules of the common law.
-
-<P><a name="8"><strong><H3>Amendment VIII</h3></strong></a>
-
-<P>Excessive bail shall not be required, nor excessive fines
-imposed, nor cruel and unusual punishments inflicted.
-
-<P><a name="9"<strong><H3>Amendment IX</h3></strong></a>
-
-<P>The enumeration in the Constitution, of certain rights, shall
-not be construed to deny or disparage others retained by the people.
-
-<P><a name="10"><strong><H3>Amendment X</h3></strong></a>
-
-<P>The powers not delegated to the United States by the
-Constitution, nor prohibited by it to the states, are
-reserved to the states respectively, or to the people.
-
 
-
+<p><center><b>THE BILL OF RIGHTS</b><br><EM>Amendments 1-10 of the Constitution</em></center>
+
+<HR>
+
+<p>The Conventions of a number of the States having, at the time of adopting the Constitution, expressed a desire, in order to prevent misconstruction or abuse of its powers, that further declaratory and restrictive clauses should be added, and as extending the ground of public confidence in the Government will best insure the beneficent ends of its institution;
+<P>
+
+Resolved, by the Senate and House of Representatives of the United States of America, in Congress assembled, two-thirds of both Houses concurring, that the following articles be proposed to the Legislatures of the several States, as amendments to the Constitution of the United States; all or any of which articles, when ratified by three-fourths of the said Legislatures, to be valid to all intents and purposes as part of the said Constitution, namely:
+
+<P><a name="1"><strong><H3>Amendment I</h3></strong></a>
+
+<P>Congress shall make no law respecting an establishment of
+religion, or prohibiting the free exercise thereof; or
+abridging the freedom of speech, or of the press; or the
+right of the people peaceably to assemble, and to petition
+the government for a redress of grievances.
+
+<P><a name="2"><strong><H3>Amendment II</h3></strong></a>
+
+<P>A well regulated militia, being necessary to the security
+of a free state, the right of the people to keep and bear
+arms, shall not be infringed.
+
+<P><a name="3"><strong><H3>Amendment III</h3></strong></a>
+
+<P>No soldier shall, in time of peace be quartered in any house,
+without the consent of the owner, nor in time of war, but
+in a manner to be prescribed by law.
+
+<P><a name="4"><strong><H3>Amendment IV</h3></strong></a>
+
+<P>The right of the people to be secure in their persons, houses,
+papers, and effects, against unreasonable searches and seizures,
+shall not be violated, and no warrants shall issue, but upon
+probable cause, supported by oath or affirmation, and
+particularly describing the place to be searched, and the
+persons or things to be seized.
+
+<P><a name="5"><strong><H3>Amendment V</h3></strong></a>
+
+<P>No person shall be held to answer for a capital, or otherwise
+infamous crime, unless on a presentment or indictment of a grand
+jury, except in cases arising in the land or naval forces,
+or in the militia, when in actual service in time of war
+or public danger; nor shall any person be subject for the
+same offense to be twice put in jeopardy of life or limb;
+nor shall be compelled in any criminal case to be a witness
+against himself, nor be deprived of life, liberty, or property,
+without due process of law; nor shall private property be
+taken for public use, without just compensation.
+
+<P><a name="6"><strong><H3>Amendment VI</h3></strong></a>
+
+<P>In all criminal prosecutions, the accused shall enjoy the right
+to a speedy and public trial, by an impartial jury of the state
+and district wherein the crime shall have been committed, which
+district shall have been previously ascertained by law, and
+to be informed of the nature and cause of the accusation;
+to be confronted with the witnesses against him; to have
+compulsory process for obtaining witnesses in his favor,
+and to have the assistance of counsel for his defense.
+
+<P><a name="7"><strong><H3>Amendment VII</h3></strong></a>
+
+<P>In suits at common law, where the value in controversy shall
+exceed twenty dollars, the right of trial by jury shall be
+preserved, and no fact tried by a jury, shall be otherwise
+reexamined in any court of the United States, than according
+to the rules of the common law.
+
+<P><a name="8"><strong><H3>Amendment VIII</h3></strong></a>
+
+<P>Excessive bail shall not be required, nor excessive fines
+imposed, nor cruel and unusual punishments inflicted.
+
+<P><a name="9"<strong><H3>Amendment IX</h3></strong></a>
+
+<P>The enumeration in the Constitution, of certain rights, shall
+not be construed to deny or disparage others retained by the people.
+
+<P><a name="10"><strong><H3>Amendment X</h3></strong></a>
+
+<P>The powers not delegated to the United States by the
+Constitution, nor prohibited by it to the states, are
+reserved to the states respectively, or to the people.
+
+
+
 
   	
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/_content/BillOfRights.html
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message