You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/07/05 10:40:29 UTC
svn commit: r674161 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-configuration/src/main/mdo/
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/
archiva-web/archiva-webapp/src/main/resources/ arch...
Author: jdumay
Date: Sat Jul 5 01:40:27 2008
New Revision: 674161
URL: http://svn.apache.org/viewvc?rev=674161&view=rev
Log:
MRM-829 - Replace Company POM feature with simple Appearence customisation
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
- copied unchanged from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
- copied unchanged from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/
- copied from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml
- copied unchanged from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/
- copied from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
- copied unchanged from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
- copied unchanged from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
- copied unchanged from r674160, archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/CompanyInfoAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/ConfigureAppearanceAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditPomAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Sat Jul 5 01:40:27 2008
@@ -158,6 +158,17 @@
The webapp configuration.
</description>
</field>
+ <field>
+ <name>organisationInfo</name>
+ <version>1.1.0+</version>
+ <association>
+ <type>OrganisationInformation</type>
+ <multiplicity>1</multiplicity>
+ </association>
+ <description>
+ The organisation info.
+ </description>
+ </field>
</fields>
<codeSegments>
<codeSegment>
@@ -1035,6 +1046,40 @@
-->
<class>
+ <name>OrganisationInformation</name>
+ <version>1.1.0+</version>
+ <description>
+ The organisation information settings.
+ </description>
+ <fields>
+ <field>
+ <name>name</name>
+ <description>name of the organisation</description>
+ <version>1.1.0+</version>
+ <association>
+ <type>String</type>
+ </association>
+ </field>
+ <field>
+ <name>url</name>
+ <description>name of the organisation</description>
+ <version>1.1.0+</version>
+ <association>
+ <type>String</type>
+ </association>
+ </field>
+ <field>
+ <name>logoLocation</name>
+ <description>name of the organisation</description>
+ <version>1.1.0+</version>
+ <association>
+ <type>String</type>
+ </association>
+ </field>
+ </fields>
+ </class>
+
+ <class>
<name>WebappConfiguration</name>
<version>1.0.0+</version>
<description>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java Sat Jul 5 01:40:27 2008
@@ -19,14 +19,12 @@
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.OrganisationInformation;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-import java.io.File;
-import java.util.Map;
+import com.opensymphony.xwork.Preparable;
/**
* AbstractAppearanceAction
@@ -36,35 +34,68 @@
*/
public abstract class AbstractAppearanceAction
extends PlexusActionSupport
+ implements Preparable
{
/**
- * @plexus.requirement role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout"
- */
- private Map<String, ArtifactRepositoryLayout> repositoryLayouts;
-
- /**
+ * Archiva Application Configuration
* @plexus.requirement
*/
- private ArtifactRepositoryFactory repoFactory;
+ protected ArchivaConfiguration configuration;
+
+ private String organisationLogo;
+
+ private String organisationUrl;
+
+ private String organisationName;
+
+ public void setConfiguration(ArchivaConfiguration configuration)
+ {
+ this.configuration = configuration;
+ }
+
+ public String getOrganisationLogo()
+ {
+ return organisationLogo;
+ }
+
+ public String getOrganisationName()
+ {
+ return organisationName;
+ }
- protected ArtifactRepository createLocalRepository()
+ public String getOrganisationUrl()
{
- String id = "archiva-local-repo";
- String layout = "default";
- String directory = System.getProperty( "user.home" ) + "/.m2/archiva";
-
- ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) repositoryLayouts.get( layout );
- File repository = new File( directory );
- repository.mkdirs();
-
- String repoDir = repository.toURI().toString();
- //workaround for spaces non converted by PathUtils in wagon
- //TODO: remove it when PathUtils will be fixed
- if ( repoDir.indexOf( "%20" ) >= 0 )
+ return organisationUrl;
+ }
+
+ public void setOrganisationLogo(String organisationLogo)
+ {
+ this.organisationLogo = organisationLogo;
+ }
+
+ public void setOrganisationName(String organisationName)
+ {
+ this.organisationName = organisationName;
+ }
+
+ public void setOrganisationUrl(String organisationUrl)
+ {
+ this.organisationUrl = organisationUrl;
+ }
+
+ public void prepare()
+ throws Exception
+ {
+ Configuration config = configuration.getConfiguration();
+ if (config != null)
{
- repoDir = StringUtils.replace( repoDir, "%20", " " );
+ OrganisationInformation orgInfo = config.getOrganisationInfo();
+ if (orgInfo != null)
+ {
+ setOrganisationLogo(orgInfo.getLogoLocation());
+ setOrganisationName(orgInfo.getName());
+ setOrganisationUrl(orgInfo.getUrl());
+ }
}
-
- return repoFactory.createArtifactRepository( id, repoDir, repositoryLayout, null, null );
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml Sat Jul 5 01:40:27 2008
@@ -22,14 +22,14 @@
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="companyPom.groupId">
- <field-validator type="requiredstring">
- <message key="appearance.groupId.required"/>
+ <field name="organisationUrl">
+ <field-validator type="url">
+ <message key="appearance.organisation.url"/>
</field-validator>
</field>
- <field name="companyPom.artifactId">
- <field-validator type="requiredstring">
- <message key="appearance.artifactId.required"/>
+ <field name="organisationLogo">
+ <field-validator type="url">
+ <message key="appearance.organisation.logourl"/>
</field-validator>
</field>
</validators>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties Sat Jul 5 01:40:27 2008
@@ -17,5 +17,5 @@
# under the License.
#
-appearance.groupId.required = You must define a group identifier.
-appearance.artifactId.required = You must define an artifact identifier.
\ No newline at end of file
+appearance.organisation.url = You must define an organisation url."
+appearance.organisation.logourl = You must define an organisation logo url."
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml Sat Jul 5 01:40:27 2008
@@ -212,7 +212,7 @@
<package name="components" namespace="/components" extends="webwork-default">
<default-interceptor-ref name="basicStack"/>
- <action name="companyInfo" class="companyInfo">
+ <action name="companyInfo" class="organisationInfo">
<result>/WEB-INF/jsp/components/companyLogo.jsp</result>
</action>
</package>
@@ -432,17 +432,15 @@
<!-- .\ CONFIGURATION \.___________________________________________ -->
- <!-- The following are needed by the maven-app-configuration-web artifact -->
-
- <action name="configureAppearance" class="configureAppearance" method="input">
- <result name="input">/WEB-INF/jsp/admin/appearance.jsp</result>
+ <action name="configureAppearance" class="organisationInfo">
+ <result name="success">/WEB-INF/jsp/admin/appearance.jsp</result>
</action>
- <action name="editAppearance" class="configureAppearance" method="input">
+ <action name="editAppearance" class="editOrganisationInfo" method="input">
<result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
</action>
- <action name="saveAppearance" class="configureAppearance">
+ <action name="saveAppearance" class="editOrganisationInfo">
<result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
<result type="redirect-action">
<param name="actionName">configureAppearance</param>
@@ -450,18 +448,6 @@
</result>
</action>
- <action name="editCompanyPom" class="editPom" method="input">
- <result name="input">/WEB-INF/jsp/admin/editPom.jsp</result>
- </action>
-
- <action name="saveCompanyPom" class="editPom">
- <result name="input">/WEB-INF/jsp/admin/editPom.jsp</result>
- <result type="redirect-action">
- <param name="actionName">configureAppearance</param>
- <param name="namespace">/admin</param>
- </result>
- </action>
-
<!-- .\ LEGACY SUPPORT \.__________________________________________ -->
<action name="legacyArtifactPath" class="legacyArtifactPathAction" method="input">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Sat Jul 5 01:40:27 2008
@@ -19,6 +19,7 @@
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
<html>
<head>
<title>Configure Appearance</title>
@@ -31,66 +32,37 @@
<div style="float: right">
<a href="<ww:url action='editAppearance' />">Edit</a>
</div>
-<h2>Company Details</h2>
+<h2>Organization Details</h2>
<p>
- The logo in the top right of the screen is controlled by your selected 'company POM'.
+ The logo in the top right of the screen is controlled by the following settings.
+ <a href="<ww:url action='editAppearance' />">Change your appearence</a>
</p>
-<ww:set name="companyPom" value="companyPom"/>
-
-<c:if test="${empty(companyPom.groupId) || empty(companyPom.artifactId)}">
- <p>
- You have not yet specified a company POM. <a href="<ww:url action='editAppearance' />">Select a Company POM</a>
- </p>
-</c:if>
-
-<c:if test="${!empty(companyPom.groupId) && !empty(companyPom.artifactId)}">
- <p>
- Your selected company POM is below. If you would like to change the organization name, url or logo, you can
- <a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
- </p>
-
- <ww:set name="companyModel" value="companyModel"/>
- <table>
- <ww:label name="companyPom.groupId" label="Group ID"/>
- <ww:label name="companyPom.artifactId" label="Artifact ID"/>
- <c:if test="${companyModel != null}">
- <ww:label name="companyModel.version" label="Version"/>
- </c:if>
- </table>
-
- <div style="float: right">
- <a href="<ww:url action='editCompanyPom' />">Edit Company POM</a>
- </div>
- <h3>POM Information</h3>
-
- <c:choose>
- <c:when test="${companyModel != null}">
+<h3>Organization Information</h3>
<table>
<tr>
<th>Name</th>
- <td>${companyModel.organization.name}</td>
+ <td>${organisationName}</td>
</tr>
<tr>
<th>URL</th>
- <td><a href="${companyModel.organization.url}">
- <code>${companyModel.organization.url}</code>
+ <td><a href="${organisationUrl}">
+ <code>${organisationUrl}</code>
</a></td>
</tr>
<tr>
<th>Logo URL</th>
<td>
- <code>${companyModel.properties['organization.logo']}</code>
+ <code>${organisationLogo}</code>
+ </td>
+ </tr>
+ <tr>
+ <th> </th>
+ <td>
+ <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
</td>
</tr>
</table>
- </c:when>
- <c:otherwise>
- Company POM '${companyPom.groupId}:${companyPom.artifactId}' doesn't exist.
- <a href="<ww:url action='editCompanyPom' />">Create company POM</a>
- </c:otherwise>
- </c:choose>
-</c:if>
</body>
</html>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Sat Jul 5 01:40:27 2008
@@ -27,19 +27,20 @@
<body>
<h1>Appearance</h1>
-<h2>Company Details</h2>
+<h2>Organization 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.
+ Enter the details of your organization below.
</p>
+<ww:set name="editOrganisationInfo" value="editOrganisationInfo"/>
<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:textfield name="organisationName" value="${organisationName}" label="Name" size="50" />
+ <ww:textfield name="organisationUrl" value="${organisationUrl}" label="URL" size="50"/>
+ <ww:textfield name="organisationLogo" value="${organisationLogo}" label="Logo URL" size="50" />
<ww:submit value="Save"/>
</ww:form>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=674161&r1=674160&r2=674161&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Sat Jul 5 01:40:27 2008
@@ -19,17 +19,16 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<ww:set name="companyLogo" value="companyLogo"/>
-<c:if test="${!empty(companyLogo)}">
- <ww:set name="companyUrl" value="companyUrl"/>
+<c:if test="${!empty(organisationLogo)}">
+ <ww:set name="organisationUrl" value="organisationUrl"/>
<c:choose>
- <c:when test="${!empty(companyUrl)}">
+ <c:when test="${!empty(organisationUrl)}">
<a href="${companyUrl}">
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
</a>
</c:when>
<c:otherwise>
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
</c:otherwise>
</c:choose>
</c:if>