You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/05/24 12:58:50 UTC
svn commit: r778118 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/
archiva-base/archiva-model/
archiva-base/archiva-model/src/main/java/org/apach...
Author: oching
Date: Sun May 24 10:58:49 2009
New Revision: 778118
URL: http://svn.apache.org/viewvc?rev=778118&view=rev
Log:
[MRM-1157] and [MRM-1176] (also related to MRM-836)
o added new column for Organization, IssueManagement, CiManagement and Individual tables to hold the actual values
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400Writer.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java Sun May 24 10:58:49 2009
@@ -34,7 +34,10 @@
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaModelCloner;
import org.apache.maven.archiva.model.ArchivaProjectModel;
+import org.apache.maven.archiva.model.CiManagement;
+import org.apache.maven.archiva.model.IssueManagement;
import org.apache.maven.archiva.model.Keys;
+import org.apache.maven.archiva.model.Organization;
import org.apache.maven.archiva.model.RepositoryProblem;
import org.apache.maven.archiva.reporting.artifact.CorruptArtifactReport;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
@@ -154,6 +157,24 @@
{
model = reader.read( artifactFile );
+ Organization organization = model.getOrganization();
+ if( organization != null )
+ {
+ log.info( "++++ [AfterRead] organization NAME --> " + organization.getName() + " : " + organization.getOrganizationName() );
+ }
+
+ IssueManagement iM = model.getIssueManagement();
+ if( iM != null )
+ {
+ log.info( "++++ [AfterRead] issueMgnt url --> " + iM.getUrl() + " : " + iM.getIssueManagementUrl() );
+ }
+
+ CiManagement ci = model.getCiManagement();
+ if( ci != null )
+ {
+ log.info( "++++ [AfterRead] ci url --> " + ci.getUrl() + " : " + ci.getCiUrl() );
+ }
+
// The version should be updated to the artifact/filename version if it is a unique snapshot
if ( VersionUtil.isUniqueSnapshot( artifact.getVersion() ) )
{
@@ -162,6 +183,24 @@
// Resolve the project model (build effective model, resolve expressions)
model = effectiveModelFilter.filter( model );
+
+ organization = model.getOrganization();
+ if( organization != null )
+ {
+ log.info( "++++ [AfterFilter] organization NAME --> " + organization.getName() + " : " + organization.getOrganizationName() );
+ }
+
+ iM = model.getIssueManagement();
+ if( iM != null )
+ {
+ log.info( "++++ [AfterFilter] issueMgnt url --> " + iM.getUrl() + " : " + iM.getIssueManagementUrl() );
+ }
+
+ ci = model.getCiManagement();
+ if( ci != null )
+ {
+ log.info( "++++ [AfterFilter] ci url --> " + ci.getUrl() + " : " + ci.getCiUrl() );
+ }
if ( isValidModel( model, repo, artifact ) )
{
@@ -170,6 +209,25 @@
// Clone model, since DAO while detachingCopy resets its contents
// This changes contents of the cache in EffectiveProjectModelFilter
model = ArchivaModelCloner.clone( model );
+
+ organization = model.getOrganization();
+ if( organization != null )
+ {
+ log.info( "++++ [AfterClone] organization NAME --> " + organization.getName() + " : " + organization.getOrganizationName() );
+ }
+
+ iM = model.getIssueManagement();
+ if( iM != null )
+ {
+ log.info( "++++ [AfterClone] issueMgnt url --> " + iM.getUrl() + " : " + iM.getIssueManagementUrl() );
+ }
+
+ ci = model.getCiManagement();
+ if( ci != null )
+ {
+ log.info( "++++ [AfterClone] ci url --> " + ci.getUrl() + " : " + ci.getCiUrl() );
+ }
+
dao.getProjectModelDAO().saveProjectModel( model );
}
else
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml Sun May 24 10:58:49 2009
@@ -50,7 +50,7 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<packageWithVersion>false</packageWithVersion>
<models>
<model>src/main/mdo/archiva-base.xml</model>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java Sun May 24 10:58:49 2009
@@ -99,6 +99,7 @@
cloned.setSystem( ciManagement.getSystem() );
cloned.setUrl( ciManagement.getUrl() );
+ cloned.setCiUrl( ciManagement.getCiUrl() );
return cloned;
}
@@ -139,6 +140,7 @@
IssueManagement cloned = new IssueManagement();
+ cloned.setIssueManagementUrl( issueManagement.getIssueManagementUrl() );
cloned.setSystem( issueManagement.getSystem() );
cloned.setUrl( issueManagement.getUrl() );
@@ -176,6 +178,7 @@
cloned.setFavicon( organization.getFavicon() );
cloned.setName( organization.getName() );
cloned.setUrl( organization.getUrl() );
+ cloned.setOrganizationName( organization.getOrganizationName() );
return cloned;
}
@@ -333,6 +336,7 @@
cloned.setOrganizationUrl( individual.getOrganizationUrl() );
cloned.setUrl( individual.getUrl() );
cloned.setTimezone( individual.getTimezone() );
+ cloned.setIndividualEmail( individual.getIndividualEmail() );
cloned.setRoles( cloneRoles( individual.getRoles() ) );
cloned.setProperties( clone( individual.getProperties() ) );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml Sun May 24 10:58:49 2009
@@ -5,7 +5,7 @@
xsd.target-namespace="http://archiva.apache.org/model/1.2.0">
<id>archiva-base-model</id>
<name>ArchivaBaseModel</name>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<description>Archiva Model</description>
<defaults>
<default>
@@ -1451,9 +1451,16 @@
<name>name</name>
<identifier>true</identifier>
<version>1.0.0+</version>
- <description><![CDATA[The full name of the organization.]]></description>
+ <description><![CDATA[The generated id of the organization object. Due to problems in upgrading,
+ we cannot unset this as the identifier and we cannot rename this as well.]]></description>
<type>String</type>
</field>
+ <field stash.maxSize="250" null-value="default">
+ <name>organizationName</name>
+ <version>1.2.1+</version>
+ <description><![CDATA[The full name of the organization.]]></description>
+ <type>String</type>
+ </field>
<field stash.maxSize="250">
<name>url</name>
<version>1.0.0+</version>
@@ -1546,6 +1553,13 @@
<name>url</name>
<identifier>true</identifier>
<version>1.0.0+</version>
+ <description><![CDATA[The generated id for the issue management object. Due to problems in upgrading,
+ we cannot unset this as the identifier and we cannot rename this as well.]]></description>
+ <type>String</type>
+ </field>
+ <field stash.maxSize="250" null-value="default">
+ <name>issueManagementUrl</name>
+ <version>1.2.1+</version>
<description><![CDATA[URL for the issue management system used by the project.]]></description>
<type>String</type>
</field>
@@ -1575,6 +1589,14 @@
<version>1.0.0+</version>
<identifier>true</identifier>
<description>
+ <![CDATA[The generated id for the CI management object. Due to problems in upgrading,
+ we cannot unset this as the identifier and we cannot rename this as well.]]></description>
+ <type>String</type>
+ </field>
+ <field stash.maxSize="250" null-value="default">
+ <name>ciUrl</name>
+ <version>1.2.1+</version>
+ <description>
<![CDATA[URL for the continuous integration system used by the project if it has a web interface.]]></description>
<type>String</type>
</field>
@@ -1609,6 +1631,13 @@
<name>email</name>
<identifier>true</identifier>
<version>1.0.0+</version>
+ <description><![CDATA[The generated id for the object. Due to problems in upgrading,
+ we cannot unset this as the identifier and we cannot rename this as well.]]></description>
+ <type>String</type>
+ </field>
+ <field stash.maxSize="250" null-value="default">
+ <name>individualEmail</name>
+ <version>1.2.1+</version>
<description><![CDATA[The email address of the individual.]]></description>
<type>String</type>
</field>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java Sun May 24 10:58:49 2009
@@ -230,6 +230,7 @@
merged.setSystem( merge( mainCim.getSystem(), parentCim.getSystem() ) );
merged.setUrl( merge( mainCim.getUrl(), parentCim.getUrl() ) );
+ merged.setCiUrl( merge( mainCim.getCiUrl(), parentCim.getCiUrl() ) );
return merged;
}
@@ -289,7 +290,8 @@
merged.setSystem( merge( mainIssueManagement.getSystem(), parentIssueManagement.getSystem() ) );
merged.setUrl( merge( mainIssueManagement.getUrl(), parentIssueManagement.getUrl() ) );
-
+ merged.setIssueManagementUrl( merge( mainIssueManagement.getIssueManagementUrl(), parentIssueManagement.getIssueManagementUrl() ) );
+
return merged;
}
@@ -308,6 +310,7 @@
Organization merged = new Organization();
merged.setFavicon( merge( mainOrganization.getFavicon(), parentOrganization.getFavicon() ) );
+ merged.setOrganizationName( merge( mainOrganization.getOrganizationName(), parentOrganization.getOrganizationName() ) );
merged.setName( merge( mainOrganization.getName(), parentOrganization.getName() ) );
merged.setUrl( merge( mainOrganization.getUrl(), parentOrganization.getUrl() ) );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java Sun May 24 10:58:49 2009
@@ -24,6 +24,7 @@
import org.apache.maven.archiva.model.ArchivaModelCloner;
import org.apache.maven.archiva.model.ArchivaProjectModel;
import org.apache.maven.archiva.model.Dependency;
+import org.apache.maven.archiva.model.IssueManagement;
import org.apache.maven.archiva.model.VersionedReference;
import org.apache.maven.archiva.repository.project.ProjectModelException;
import org.apache.maven.archiva.repository.project.ProjectModelFilter;
@@ -98,6 +99,14 @@
// Clone submitted project (so that we don't mess with it)
effectiveProject = ArchivaModelCloner.clone( project );
+
+ System.out.println( "++++[EFFECTIVE Project] effectiveProject --> " + effectiveProject );
+ IssueManagement iM = effectiveProject.getIssueManagement();
+ if( iM != null )
+ {
+ System.out.println( "++++[EFFECTIVE Project] issue mgnt URL --> " + iM.getUrl() + " $$ " +
+ iM.getIssueManagementUrl() );
+ }
DEBUG( "Starting build of effective with: " + effectiveProject );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java Sun May 24 10:58:49 2009
@@ -215,6 +215,7 @@
ciManagement.setSystem( eval.expand( ciManagement.getSystem() ) );
ciManagement.setUrl( eval.expand( ciManagement.getUrl() ) );
+ ciManagement.setCiUrl( eval.expand( ciManagement.getCiUrl() ) );
}
private void evaluateDependencyList( ExpressionEvaluator eval, List<Dependency> dependencies )
@@ -270,6 +271,7 @@
individual.setOrganization( eval.expand( individual.getOrganization() ) );
individual.setOrganizationUrl( eval.expand( individual.getOrganizationUrl() ) );
individual.setUrl( eval.expand( individual.getUrl() ) );
+ individual.setIndividualEmail( eval.expand( individual.getIndividualEmail() ) );
evaluateProperties( eval, individual.getProperties() );
evaluateStringList( eval, individual.getRoles() );
@@ -286,6 +288,7 @@
issueManagement.setSystem( eval.expand( issueManagement.getSystem() ) );
issueManagement.setUrl( eval.expand( issueManagement.getUrl() ) );
+ issueManagement.setIssueManagementUrl( eval.expand( issueManagement.getIssueManagementUrl() ) );
}
private void evaluateLicenses( ExpressionEvaluator eval, List<License> licenses )
@@ -332,6 +335,7 @@
return;
}
+ organization.setOrganizationName( eval.expand( organization.getOrganizationName() ) );
organization.setName( eval.expand( organization.getName() ) );
organization.setUrl( eval.expand( organization.getUrl() ) );
organization.setFavicon( eval.expand( organization.getFavicon() ) );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java Sun May 24 10:58:49 2009
@@ -227,6 +227,7 @@
individual.setOrganizationUrl( elemPerson.elementTextTrim( "organizationUrl" ) );
individual.setUrl( elemPerson.elementTextTrim( "url" ) );
individual.setTimezone( elemPerson.elementTextTrim( "timezone" ) );
+ individual.setIndividualEmail( elemPerson.elementTextTrim( "email" ) );
// Roles
Element elemRoles = elemPerson.element( "roles" );
@@ -268,7 +269,8 @@
IssueManagement issueMgmt = new IssueManagement();
issueMgmt.setUrl( issueTrackingUrl );
-
+ issueMgmt.setIssueManagementUrl( issueTrackingUrl );
+
return issueMgmt;
}
@@ -345,6 +347,7 @@
{
Organization org = new Organization();
+ org.setOrganizationName( elemOrg.elementTextTrim( "name" ) );
org.setName( elemOrg.elementTextTrim( "name" ) );
org.setUrl( elemOrg.elementTextTrim( "url" ) );
// TODO: Handle <logo />
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java Sun May 24 10:58:49 2009
@@ -153,6 +153,7 @@
CiManagement ciManagement = new CiManagement();
ciManagement.setSystem( elemCiMgmt.elementTextTrim( "system" ) );
ciManagement.setUrl( elemCiMgmt.elementTextTrim( "url" ) );
+ ciManagement.setCiUrl( elemCiMgmt.elementTextTrim( "url" ) );
return ciManagement;
}
@@ -282,6 +283,7 @@
individual.setOrganizationUrl( elemPerson.elementTextTrim( "organizationUrl" ) );
individual.setUrl( elemPerson.elementTextTrim( "url" ) );
individual.setTimezone( elemPerson.elementTextTrim( "timezone" ) );
+ individual.setIndividualEmail( elemPerson.elementTextTrim( "email" ) );
// Roles
Element elemRoles = elemPerson.element( "roles" );
@@ -315,7 +317,8 @@
issueMgmt.setSystem( elemIssueMgmt.elementTextTrim( "system" ) );
issueMgmt.setUrl( elemIssueMgmt.elementTextTrim( "url" ) );
-
+ issueMgmt.setIssueManagementUrl( elemIssueMgmt.elementTextTrim( "url" ) );
+
return issueMgmt;
}
@@ -393,6 +396,7 @@
{
Organization org = new Organization();
+ org.setOrganizationName( elemOrg.elementTextTrim( "name" ) );
org.setName( elemOrg.elementTextTrim( "name" ) );
org.setUrl( elemOrg.elementTextTrim( "url" ) );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400Writer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400Writer.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400Writer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400Writer.java Sun May 24 10:58:49 2009
@@ -387,6 +387,7 @@
Element elem = root.addElement( "organization" );
+ //addChildElement( elem, "name", organization.getOrganizationName() );
addChildElement( elem, "name", organization.getName() );
addChildElement( elem, "url", organization.getUrl() );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java Sun May 24 10:58:49 2009
@@ -167,19 +167,19 @@
}
if ( sharedModel.getIssueManagement() != null && model.getIssueManagement() != null &&
- !StringUtils.equalsIgnoreCase( sharedModel.getIssueManagement().getUrl(), model.getIssueManagement().getUrl() ) )
+ !StringUtils.equalsIgnoreCase( sharedModel.getIssueManagement().getIssueManagementUrl(), model.getIssueManagement().getIssueManagementUrl() ) )
{
sharedModel.setIssueManagement( null );
}
if ( sharedModel.getCiManagement() != null && model.getCiManagement() != null &&
- !StringUtils.equalsIgnoreCase( sharedModel.getCiManagement().getUrl(), model.getCiManagement().getUrl() ) )
+ !StringUtils.equalsIgnoreCase( sharedModel.getCiManagement().getCiUrl(), model.getCiManagement().getCiUrl() ) )
{
sharedModel.setCiManagement( null );
}
if ( sharedModel.getOrganization() != null && model.getOrganization() != null &&
- !StringUtils.equalsIgnoreCase( sharedModel.getOrganization().getName(), model.getOrganization().getName() ) )
+ !StringUtils.equalsIgnoreCase( sharedModel.getOrganization().getOrganizationName(), model.getOrganization().getOrganizationName() ) )
{
sharedModel.setOrganization( null );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp Sun May 24 10:58:49 2009
@@ -128,10 +128,10 @@
<td>
<c:choose>
<c:when test="${(sharedModel.organization.url != null) && (!empty sharedModel.organization.url)}">
- <a href="${sharedModel.organization.url}">${sharedModel.organization.name}</a>
+ <a href="${sharedModel.organization.url}">${sharedModel.organization.organizationName}</a>
</c:when>
<c:otherwise>
- ${sharedModel.organization.name}
+ ${sharedModel.organization.organizationName}
</c:otherwise>
</c:choose>
</td>
@@ -142,8 +142,8 @@
<th>Issue Tracker</th>
<td>
<c:choose>
- <c:when test="${!empty (sharedModel.issueManagement.url)}">
- <a href="${sharedModel.issueManagement.url}">${sharedModel.issueManagement.system}</a>
+ <c:when test="${!empty (sharedModel.issueManagement.issueManagementUrl)}">
+ <a href="${sharedModel.issueManagement.issueManagementUrl}">${sharedModel.issueManagement.system}</a>
</c:when>
<c:otherwise>
${sharedModel.issueManagement.system}
@@ -157,8 +157,8 @@
<th>Continuous Integration</th>
<td>
<c:choose>
- <c:when test="${!empty (sharedModel.ciManagement.url)}">
- <a href="${sharedModel.ciManagement.url}">${sharedModel.ciManagement.system}</a>
+ <c:when test="${!empty (sharedModel.ciManagement.ciUrl)}">
+ <a href="${sharedModel.ciManagement.ciUrl}">${sharedModel.ciManagement.system}</a>
</c:when>
<c:otherwise>
${sharedModel.ciManagement.system}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf?rev=778118&r1=778117&r2=778118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf Sun May 24 10:58:49 2009
@@ -169,7 +169,7 @@
<td>
<c:choose>
<c:when test="${model.organization != null}">
- <a href="${model.organization.url}">${model.organization.name}</a>
+ <a href="${model.organization.url}">${model.organization.organizationName}</a>
</c:when>
<c:otherwise>
${model.organization.name}
@@ -200,8 +200,8 @@
<th>Issue Tracker</th>
<td>
<c:choose>
- <c:when test="${!empty (model.issueManagement.url)}">
- <a href="${model.issueManagement.url}">${model.issueManagement.system}</a>
+ <c:when test="${!empty (model.issueManagement.issueManagementUrl)}">
+ <a href="${model.issueManagement.issueManagementUrl}">${model.issueManagement.system}</a>
</c:when>
<c:otherwise>
${model.issueManagement.system}
@@ -215,8 +215,8 @@
<th>Continuous Integration</th>
<td>
<c:choose>
- <c:when test="${!empty (model.ciManagement.url)}">
- <a href="${model.ciManagement.url}">${model.ciManagement.system}</a>
+ <c:when test="${!empty (model.ciManagement.ciUrl)}">
+ <a href="${model.ciManagement.ciUrl}">${model.ciManagement.system}</a>
</c:when>
<c:otherwise>
${model.ciManagement.system}