You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2007/11/10 14:42:27 UTC
svn commit: r593773 - in /maven/continuum/trunk: ./ continuum-webapp/
continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/
continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/
continuum-webapp/src/main/...
Author: olamy
Date: Sat Nov 10 05:42:26 2007
New Revision: 593773
URL: http://svn.apache.org/viewvc?rev=593773&view=rev
Log:
[CONTINUUM-1397] ability to customise html footer
[CONTINUUM-1557] Appearance is not saved upgrade to last plexus-registry-commons
Added:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java (with props)
Modified:
maven/continuum/trunk/continuum-webapp/pom.xml
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
maven/continuum/trunk/pom.xml
Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Sat Nov 10 05:42:26 2007
@@ -199,6 +199,10 @@
<value>${project.build.directory}/appserver-base</value>
</systemProperty>
<systemProperty>
+ <name>appserver.home</name>
+ <value>${project.build.directory}/appserver-home</value>
+ </systemProperty>
+ <systemProperty>
<name>derby.system.home</name>
<value>${project.build.directory}/appserver-base/logs</value>
</systemProperty>
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java Sat Nov 10 05:42:26 2007
@@ -19,12 +19,14 @@
* under the License.
*/
-import com.opensymphony.xwork.ModelDriven;
+import java.io.IOException;
+
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper;
import org.apache.maven.continuum.execution.maven.m2.SettingsConfigurationException;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.action.component.AbstractFooterAction;
+import org.apache.maven.continuum.web.appareance.AppareanceConfiguration;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.shared.app.company.CompanyPomHandler;
@@ -36,7 +38,7 @@
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.registry.RegistryException;
-import java.io.IOException;
+import com.opensymphony.xwork.ModelDriven;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -44,7 +46,7 @@
* @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureAppearance"
*/
public class ConfigureAppearanceAction
- extends ContinuumActionSupport
+ extends AbstractFooterAction
implements ModelDriven, SecureAction
{
/**
@@ -68,7 +70,13 @@
* @plexus.requirement
*/
private MavenBuilderHelper helper;
+
+ /**
+ * @plexus.requirement
+ */
+ private AppareanceConfiguration appareanceConfiguration;
+
public String execute()
throws IOException, RegistryException
{
@@ -82,7 +90,7 @@
{
return INPUT;
}
-
+
public Object getModel()
{
return configuration;
@@ -95,6 +103,8 @@
companyModel =
companyPomHandler.getCompanyPomModel( configuration.getCompanyPom(), helper.getLocalRepository() );
+
+ this.setFooter( appareanceConfiguration.getFooter() );
}
public Model getCompanyModel()
@@ -111,4 +121,5 @@
return bundle;
}
+
}
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java?rev=593773&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java Sat Nov 10 05:42:26 2007
@@ -0,0 +1,47 @@
+/*
+ * 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.maven.continuum.web.action.admin;
+
+import org.apache.maven.continuum.web.action.component.AbstractFooterAction;
+import org.apache.maven.continuum.web.appareance.AppareanceConfiguration;
+import org.codehaus.plexus.registry.RegistryException;
+
+/**
+ * @author <a href="mailto:olamy@apache.org">olamy</a>
+ * @since 9 nov. 07
+ * @version $Id$
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureFooter"
+ */
+public class ConfigureFooterAction
+ extends AbstractFooterAction
+{
+
+ /**
+ * @plexus.requirement
+ */
+ private AppareanceConfiguration appareanceConfiguration;
+
+ public String saveFooter()
+ throws RegistryException
+ {
+ appareanceConfiguration.saveFooter( getFooter() );
+ return SUCCESS;
+ }
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Nov 10 05:42:26 2007
@@ -0,0 +1 @@
+URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java?rev=593773&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java Sat Nov 10 05:42:26 2007
@@ -0,0 +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.maven.continuum.web.action.component;
+
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.appareance.AppareanceConfiguration;
+
+/**
+ * @author <a href="mailto:olamy@apache.org">olamy</a>
+ * @since 8 nov. 07
+ * @version $Id$
+ */
+public abstract class AbstractFooterAction
+ extends ContinuumActionSupport
+{
+
+ private String footer;
+
+ /**
+ * @plexus.requirement
+ */
+ private AppareanceConfiguration appareanceConfiguration;
+
+ public String getContinuumFooter()
+ {
+ return appareanceConfiguration.getFooter();
+ }
+
+ public String getFooter()
+ {
+ return footer;
+ }
+
+ public void setFooter( String footer )
+ {
+ this.footer = footer;
+ }
+
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Nov 10 05:42:26 2007
@@ -0,0 +1 @@
+URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java?rev=593773&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java Sat Nov 10 05:42:26 2007
@@ -0,0 +1,37 @@
+/*
+ * 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.maven.continuum.web.action.component;
+
+
+/**
+ * @author <a href="mailto:olamy@apache.org">olamy</a>
+ * @since 8 nov. 07
+ * @version $Id$
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="bottom"
+ */
+public class BottomAction
+ extends AbstractFooterAction
+{
+
+ public String execute()
+ {
+ return SUCCESS;
+ }
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Nov 10 05:42:26 2007
@@ -0,0 +1 @@
+URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java?rev=593773&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java Sat Nov 10 05:42:26 2007
@@ -0,0 +1,46 @@
+/*
+ * 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.maven.continuum.web.appareance;
+
+import org.codehaus.plexus.registry.RegistryException;
+
+/**
+ * @author <a href="mailto:olamy@apache.org">olamy</a>
+ * @since 10 nov. 07
+ * @version $Id$
+ */
+public interface AppareanceConfiguration
+{
+
+ /**
+ * @param footerHtmlContent
+ * @throws RegistryException
+ */
+ public void saveFooter( String footerHtmlContent )
+ throws RegistryException;
+
+ /**
+ * If no user configuration a default one will be user
+ * with Apache copyright content
+ *
+ * @return htmlFooter
+ */
+ public String getFooter();
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Nov 10 05:42:26 2007
@@ -0,0 +1 @@
+URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java?rev=593773&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java Sat Nov 10 05:42:26 2007
@@ -0,0 +1,113 @@
+/*
+ * 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.maven.continuum.web.appareance;
+
+import java.util.Calendar;
+
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.registry.Registry;
+import org.codehaus.plexus.registry.RegistryException;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * @author <a href="mailto:olamy@apache.org">olamy</a>
+ * @since 10 nov. 07
+ * @version $Id$
+ * @plexus.component role="org.apache.maven.continuum.web.appareance.AppareanceConfiguration" role-hint="default"
+ */
+public class DefaultAppareanceConfiguration
+ implements AppareanceConfiguration, Initializable
+{
+
+ private String FOOTER_REGISTRY_KEY = "footer";
+
+ private String REGISTRY_SECTION_KEY = "org.apache.maven.continuum.user";
+
+ private String footer;
+
+ /**
+ * @plexus.requirement role-hint="commons-configuration"
+ */
+ private Registry registry;
+
+ // ------------------------------------------------
+ // Plexus Lifecycle
+ // ------------------------------------------------
+
+ public void initialize()
+ throws InitializationException
+ {
+ Registry continuumRegistry = getContinuumRegistry();
+ if (continuumRegistry != null)
+ {
+ this.footer = continuumRegistry.getString( FOOTER_REGISTRY_KEY );
+ }
+
+ if ( StringUtils.isEmpty( this.footer ) )
+ {
+ // initiate with default footer (save in registry ?)
+ this.footer = getDefaultFooter();
+ }
+ }
+
+ /**
+ * @see org.apache.maven.continuum.web.appareance.AppareanceConfiguration#getFooter()
+ */
+ public String getFooter()
+ {
+ return this.footer;
+ }
+
+ /**
+ * @see org.apache.maven.continuum.web.appareance.AppareanceConfiguration#saveFooter(java.lang.String)
+ */
+ public void saveFooter( String footerHtmlContent )
+ throws RegistryException
+ {
+ Registry continuumRegistry = getContinuumRegistry();
+
+ continuumRegistry.setString( FOOTER_REGISTRY_KEY, footerHtmlContent );
+ continuumRegistry.save();
+ this.footer = footerHtmlContent;
+ }
+
+ // ------------------------------------------------
+ // Internal stuff
+ // ------------------------------------------------
+
+ private Registry getContinuumRegistry()
+ {
+ return registry.getSection( REGISTRY_SECTION_KEY );
+ }
+
+ private String getDefaultFooter()
+ {
+ int inceptionYear = 2005;
+ int currentYear = Calendar.getInstance().get( Calendar.YEAR );
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append( "<div class=\"xright\">" );
+ stringBuilder.append( "Copyright © " );
+ stringBuilder.append( String.valueOf( inceptionYear ) + "-" + String.valueOf( currentYear ) );
+ stringBuilder.append( " The Apache Software Foundation" );
+ stringBuilder.append( "</div> <div class=\"clear\"><hr/></div>" );
+ return stringBuilder.toString();
+ }
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Nov 10 05:42:26 2007
@@ -0,0 +1 @@
+URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Sat Nov 10 05:42:26 2007
@@ -58,7 +58,7 @@
config-name="com.mergere.maestro.projectserver"
config-at="com.mergere.maestro.projectserver" config-forceCreate="true"/>
<xml fileName="${appserver.base}/conf/continuum.xml" config-optional="true"
- config-at="org.apache.maven.continuum" config-forceCreate="true" />
+ config-at="org.apache.maven.continuum" config-forceCreate="true"/>
<xml fileName="${appserver.base}/conf/shared.xml" config-optional="true"
config-name="org.apache.maven.shared.app.user" config-at="org.apache.maven.shared.app"
config-forceCreate="true"/>
@@ -70,7 +70,8 @@
<xml fileName="${appserver.home}/conf/maestro.xml" config-optional="true"
config-at="com.mergere.maestro.projectserver"/>
<xml fileName="${appserver.home}/conf/continuum.xml" config-optional="true"
- config-at="org.apache.maven.continuum"/>
+ config-at="org.apache.maven.continuum" config-name="org.apache.maven.continuum.user"
+ config-forceCreate="true"/>
<xml fileName="${appserver.home}/conf/shared.xml" config-optional="true"
config-at="org.apache.maven.shared.app" />
<xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
@@ -89,6 +90,7 @@
</properties>
</configuration>
</component>
+
<!--
| The mail notifier
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml Sat Nov 10 05:42:26 2007
@@ -101,6 +101,10 @@
<logger name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager">
<level value="error"/>
</logger>
+
+ <logger name="org.apache.commons.configuration">
+ <level value="debug"/>
+ </logger>
<root>
<priority value="info" />
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Sat Nov 10 05:42:26 2007
@@ -164,6 +164,12 @@
<result name="success">/WEB-INF/jsp/components/companyLogo.jsp</result>
<interceptor-ref name="basicStack" />
</action>
+
+ <action name="bottom" class="bottom">
+ <result name="success">/WEB-INF/jsp/navigations/DefaultBottom.jsp</result>
+ <interceptor-ref name="basicStack" />
+ </action>
+
<action name="groupSummary" class="groupSummary">
<result name="success">/WEB-INF/jsp/groupSummary.jsp</result>
@@ -516,6 +522,11 @@
<action name="configureAppearance" class="configureAppearance" method="input">
<result name="input">/WEB-INF/jsp/admin/appearance.jsp</result>
</action>
+
+ <action name="saveFooter" class="configureFooter" method="saveFooter">
+ <result name="input">/WEB-INF/jsp/admin/appearance.jsp</result>
+ <result name="success">/WEB-INF/jsp/admin/appearance.jsp</result>
+ </action>
<action name="editAppearance" class="configureAppearance" method="input">
<result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Sat Nov 10 05:42:26 2007
@@ -19,6 +19,7 @@
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="continuum" prefix="c1" %>
<html>
<head>
<title>Configure Appearance</title>
@@ -92,6 +93,21 @@
</c:otherwise>
</c:choose>
</c:if>
+<ww:form action="saveFooter!saveFooter.action" method="get" namespace="/admin">
+ <div id="axial" class="h3">
+ <h3>footer content</h3>
+ <div class="axial">
+ <table>
+ <tbody>
+ <ww:textarea cols="120" rows="3" label="HTML Content" name="footer" />
+ </tbody>
+ </table>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </div>
+ </div>
+</ww:form>
</body>
</html>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Sat Nov 10 05:42:26 2007
@@ -25,21 +25,21 @@
</head>
<body>
-<h1>Appearance</h1>
+ <h1>Appearance</h1>
-<h2>Company Details</h2>
+ <h2>Company Details</h2>
-<p>
- Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read
- from it.
-</p>
+ <p>
+ Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read
+ from it.
+ </p>
-<ww:actionmessage/>
-<ww:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
- <ww:textfield name="companyPom.groupId" label="Group ID"/>
- <ww:textfield name="companyPom.artifactId" label="Artifact ID"/>
- <ww:submit value="Save"/>
-</ww:form>
+ <ww:actionmessage/>
+ <ww:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
+ <ww:textfield name="companyPom.groupId" label="Group ID"/>
+ <ww:textfield name="companyPom.artifactId" label="Artifact ID"/>
+ <ww:submit value="Save"/>
+ </ww:form>
</body>
</html>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Sat Nov 10 05:42:26 2007
@@ -59,7 +59,7 @@
</tbody>
</table>
-<%@ include file="/WEB-INF/jsp/navigations/DefaultBottom.jsp" %>
+<ww:action name="bottom" executeResult="true"/>
<script language="javascript">
<!--
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp Sat Nov 10 05:42:26 2007
@@ -20,23 +20,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ page import="java.util.Calendar" %>
<ww:i18n name="localization.Continuum">
-<%
- int inceptionYear = 2005;
- int currentYear = Calendar.getInstance().get( Calendar.YEAR );
- String copyrightRange = String.valueOf( inceptionYear );
- if ( inceptionYear != currentYear )
- {
- copyrightRange = copyrightRange + "-" + String.valueOf( currentYear );
- }
-%>
<div id="footer">
- <div class="xright">
- Copyright © <%= copyrightRange %> The Apache Software Foundation
- </div>
-
- <div class="clear">
- <hr/>
-
- </div>
+ <ww:property value="continuumFooter" escape="false"/>
</div>
</ww:i18n>
Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?rev=593773&r1=593772&r2=593773&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Sat Nov 10 05:42:26 2007
@@ -523,12 +523,12 @@
<dependency>
<groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-api</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0-alpha-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-commons</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0-alpha-3-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>