Author: jdumay
Date: Tue Jul 1 23:29:02 2008
New Revision: 673294
URL: http://svn.apache.org/viewvc?rev=673294&view=rev
Log:
MRM-829 - Current work
Added:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
- copied, changed from r662932,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditPomAction.java
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
- copied, changed from r662932,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/CompanyInfoAction.java
Removed:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/CompanyInfoAction.java
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/ConfigureAppearanceAction.java
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditPomAction.java
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
Modified:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Modified:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Tue Jul 1 23:29:02 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/branches/archiva-MRM-829/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/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
Tue Jul 1 23:29:02 2008
@@ -19,15 +19,9 @@
* 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.codehaus.plexus.xwork.action.PlexusActionSupport;
-import java.io.File;
-import java.util.Map;
-
/**
* AbstractAppearanceAction
*
@@ -38,33 +32,44 @@
extends PlexusActionSupport
{
/**
- * @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 String getOrganisationLogo()
+ {
+ return organisationLogo;
+ }
- protected ArtifactRepository createLocalRepository()
+ public String getOrganisationName()
{
- 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 )
- {
- repoDir = StringUtils.replace( repoDir, "%20", " " );
- }
+ return organisationName;
+ }
- return repoFactory.createArtifactRepository( id, repoDir,
repositoryLayout, null, null );
+ public String getOrganisationUrl()
+ {
+ 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;
}
}
Copied:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
(from r662932,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditPomAction.java)
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java?p2=archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditPomAction.java&r1=662932&r2=673294&rev=673294&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditPomAction.java
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
Tue Jul 1 23:29:02 2008
@@ -19,107 +19,56 @@
* under the License.
*/
-import com.opensymphony.xwork.ModelDriven;
-import com.opensymphony.xwork.Preparable;
+import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
+import org.apache.maven.archiva.configuration.Configuration;
+import
org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
+import org.apache.maven.archiva.configuration.OrganisationInformation;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.apache.maven.artifact.installer.ArtifactInstallationException;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.shared.app.company.CompanyPomHandler;
-import org.apache.maven.shared.app.configuration.CompanyPom;
-import org.apache.maven.shared.app.configuration.Configuration;
-import org.apache.maven.shared.app.configuration.MavenAppConfiguration;
import org.codehaus.plexus.redback.rbac.Resource;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
-
-import java.io.IOException;
+import org.codehaus.plexus.registry.RegistryException;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id: ConfigurationAction.java 480950 2006-11-30 14:58:35Z evenisse
$
*
* @plexus.component role="com.opensymphony.xwork.Action"
- * role-hint="editPom"
+ * role-hint="editOrganisationInfo"
*/
-public class EditPomAction
+public class EditOrganisationInfoAction
extends AbstractAppearanceAction
- implements ModelDriven, SecureAction, Preparable
+ implements SecureAction
{
- /**
- * @plexus.requirement
- */
- private MavenAppConfiguration appConfigurationStore;
-
- /**
- * The configuration.
- */
- private Configuration configuration;
-
- /**
- * @plexus.requirement
- */
- private CompanyPomHandler companyPomHandler;
-
- private Model companyModel;
-
+ @Override
public String execute()
- throws IOException, ArtifactInstallationException
+ throws RegistryException, IndeterminateConfigurationException
{
- // TODO: hack for passed in String[]
- String[] logo = (String[]) companyModel.getProperties().get(
"organization.logo" );
- if ( logo != null )
+ Configuration config = configuration.getConfiguration();
+ if (config != null)
{
- companyModel.getProperties().put( "organization.logo", logo[0] );
- }
-
- companyPomHandler.save( companyModel, createLocalRepository() );
-
- return SUCCESS;
- }
-
- public Object getModel()
- {
- return companyModel;
- }
-
- public void prepare()
- throws ProjectBuildingException, ArtifactMetadataRetrievalException
- {
- configuration = appConfigurationStore.getConfiguration();
-
- CompanyPom companyPom = configuration.getCompanyPom();
- companyModel = companyPomHandler.getCompanyPomModel( companyPom,
createLocalRepository() );
-
- if ( companyModel == null )
- {
- companyModel = new Model();
- companyModel.setModelVersion( "4.0.0" );
- companyModel.setPackaging( "pom" );
-
- if ( companyPom != null )
+ OrganisationInformation orgInfo = config.getOrganisationInfo();
+ if (orgInfo == null)
{
- companyModel.setGroupId( companyPom.getGroupId() );
- companyModel.setArtifactId( companyPom.getArtifactId() );
+ config.setOrganisationInfo(orgInfo);
}
+
+ orgInfo.setLogoLocation(getOrganisationLogo());
+ orgInfo.setName(getOrganisationName());
+ orgInfo.setUrl(getOrganisationUrl());
+
+ configuration.save(config);
}
+ return SUCCESS;
}
-
+
public SecureActionBundle getSecureActionBundle()
throws SecureActionException
{
SecureActionBundle bundle = new SecureActionBundle();
bundle.setRequiresAuthentication( true );
bundle.addRequiredAuthorization(
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION, Resource.GLOBAL );
-
return bundle;
}
-
- public Model getCompanyModel()
- {
- return companyModel;
- }
}
Copied:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
(from r662932,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/CompanyInfoAction.java)
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java?p2=archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/CompanyInfoAction.java&r1=662932&r2=673294&rev=673294&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/CompanyInfoAction.java
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java
Tue Jul 1 23:29:02 2008
@@ -19,66 +19,32 @@
* under the License.
*/
-import org.apache.maven.model.Model;
-import org.apache.maven.shared.app.company.CompanyPomHandler;
-import org.apache.maven.shared.app.configuration.MavenAppConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.OrganisationInformation;
/**
- * Stores the company information for displaying on the page.
+ * Stores the organisation information for displaying on the page.
*
- * @plexus.component role="com.opensymphony.xwork.Action"
role-hint="companyInfo"
+ * @plexus.component role="com.opensymphony.xwork.Action"
role-hint="organisationInfo"
*/
-public class CompanyInfoAction
+public class OrganisationInfoAction
extends AbstractAppearanceAction
{
- private String companyLogo;
-
- private String companyUrl;
-
- private String companyName;
-
- /**
- * @plexus.requirement
- */
- private CompanyPomHandler handler;
-
- /**
- * @plexus.requirement
- */
- private MavenAppConfiguration appConfigurationStore;
-
+ @Override
public String execute()
throws Exception
- {
- Model model = handler.getCompanyPomModel(
appConfigurationStore.getConfiguration().getCompanyPom(),
- createLocalRepository() );
-
- if ( model != null )
+ {
+ Configuration config = configuration.getConfiguration();
+ if (config != null)
{
- if ( model.getOrganization() != null )
+ OrganisationInformation orgInfo = config.getOrganisationInfo();
+ if (orgInfo != null)
{
- companyName = model.getOrganization().getName();
- companyUrl = model.getOrganization().getUrl();
+ setOrganisationLogo(orgInfo.getLogoLocation());
+ setOrganisationName(orgInfo.getName());
+ setOrganisationUrl(orgInfo.getUrl());
}
-
- companyLogo = model.getProperties().getProperty(
"organization.logo" );
}
-
return SUCCESS;
}
-
- public String getCompanyLogo()
- {
- return companyLogo;
- }
-
- public String getCompanyUrl()
- {
- return companyUrl;
- }
-
- public String getCompanyName()
- {
- return companyName;
- }
}
\ No newline at end of file
Modified:
archiva/branches/archiva-MRM-829/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/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml
Tue Jul 1 23:29:02 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/branches/archiva-MRM-829/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/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties
Tue Jul 1 23:29:02 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/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml
Tue Jul 1 23:29:02 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>
@@ -434,15 +434,15 @@
<!-- The following are needed by the maven-app-configuration-web artifact
-->
- <action name="configureAppearance" class="configureAppearance"
method="input">
+ <action name="configureAppearance" class="organisationInfo" method="input">
<result name="input">/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 +450,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/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Tue Jul 1 23:29:02 2008
@@ -31,66 +31,12 @@
<div style="float: right">
<a href="<ww:url action='editAppearance' />">Edit</a>
</div>
-<h2>Company Details</h2>
+<h2>Organisation 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}">
- <table>
- <tr>
- <th>Name</th>
- <td>${companyModel.organization.name}</td>
- </tr>
- <tr>
- <th>URL</th>
- <td><a href="${companyModel.organization.url}">
- <code>${companyModel.organization.url}</code>
- </a></td>
- </tr>
- <tr>
- <th>Logo URL</th>
- <td>
- <code>${companyModel.properties['organization.logo']}</code>
- </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/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
Tue Jul 1 23:29:02 2008
@@ -27,7 +27,7 @@
<body>
<h1>Appearance</h1>
-<h2>Company Details</h2>
+<h2>Organisation Details</h2>
<p>
Enter the details of the company super POM below. If it exists, the
organization name, URL and logo will be read
@@ -35,9 +35,10 @@
</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:form method="post" action="editAppearance" namespace="/admin"
validate="true" theme="xhtml">
+ <ww:textfield name="editAppearance.organisationName" label="Organisation
Name"/>
+ <ww:textfield name="editAppearance.organisationUrl" label="Organisation
Url"/>
+ <ww:textfield name="editAppearance.organisationLogo" label="Orgnaisation
Logo"/>
<ww:submit value="Save"/>
</ww:form>
</body>
Modified:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=673294&r1=673293&r2=673294&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Tue Jul 1 23:29:02 2008
@@ -19,7 +19,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<ww:set name="companyLogo" value="companyLogo"/>
+<ww:set name="organisationInfo" value="organisationInfo"/>
<c:if test="${!empty(companyLogo)}">
<ww:set name="companyUrl" value="companyUrl"/>
<c:choose>
