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 2008/06/26 13:12:48 UTC
svn commit: r671856 - in /archiva/trunk/archiva-modules:
archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/
archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/
archiva-web/archiva-rss/src/main/java/org/apache/archiv...
Author: oching
Date: Thu Jun 26 04:12:47 2008
New Revision: 671856
URL: http://svn.apache.org/viewvc?rev=671856&view=rev
Log:
cleanup some of the rss code
Modified:
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/AbstractArtifactsRssFeedProcessor.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java
Modified: archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsByRepositoryConstraintTest.java Thu Jun 26 04:12:47 2008
@@ -105,16 +105,19 @@
artifact.getModel().setWhenGathered( whenGathered );
artifactDao.saveArtifact( artifact );
+ Date olderWhenGathered = Calendar.getInstance().getTime();
+ olderWhenGathered.setTime( 123456789 );
+
artifact = createArtifact( "org.apache.archiva", "artifact-two", "1.1-SNAPSHOT" );
- artifact.getModel().setWhenGathered( whenGathered );
+ artifact.getModel().setWhenGathered( olderWhenGathered );
artifactDao.saveArtifact( artifact );
artifact = createArtifact( "org.apache.archiva", "artifact-three", "2.0-beta-1" );
artifact.getModel().setWhenGathered( whenGathered );
artifactDao.saveArtifact( artifact );
- assertConstraint( "Artifacts By Repository and When Gathered", 5,
- new ArtifactsByRepositoryConstraint( "test-repo" ) );
+ assertConstraint( "Artifacts By Repository and When Gathered", 4,
+ new ArtifactsByRepositoryConstraint( "test-repo", whenGathered, "repositoryId" ) );
}
private void assertConstraint( String msg, int count, ArtifactsByRepositoryConstraint constraint )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java Thu Jun 26 04:12:47 2008
@@ -50,15 +50,14 @@
public static String DEFAULT_LANGUAGE = "en-us";
- private String DEFAULT_LINK = "http://localhost:8080/archiva/rss/";
+ //private String DEFAULT_LINK = "http://localhost:8080/archiva/rss/";
- public SyndFeed generateFeed( String title, String description, List<RssFeedEntry> dataEntries,
- String queryString )
+ public SyndFeed generateFeed( String title, String description, List<RssFeedEntry> dataEntries )
{
SyndFeed feed = new SyndFeedImpl();
feed.setTitle( title );
- feed.setLink( DEFAULT_LINK + queryString );
+ //feed.setLink( DEFAULT_LINK + queryString );
feed.setDescription( description );
feed.setLanguage( DEFAULT_LANGUAGE );
feed.setPublishedDate( dataEntries.get( dataEntries.size() - 1 ).getPublishedDate() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/AbstractArtifactsRssFeedProcessor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/AbstractArtifactsRssFeedProcessor.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/AbstractArtifactsRssFeedProcessor.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/AbstractArtifactsRssFeedProcessor.java Thu Jun 26 04:12:47 2008
@@ -25,6 +25,7 @@
import java.util.Map;
import org.apache.archiva.rss.RssFeedEntry;
+import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.model.ArchivaArtifact;
import com.sun.syndication.feed.synd.SyndFeed;
@@ -36,7 +37,7 @@
public abstract class AbstractArtifactsRssFeedProcessor
implements RssFeedProcessor
{
- public abstract SyndFeed process( Map<String, String> reqParams );
+ public abstract SyndFeed process( Map<String, String> reqParams ) throws ArchivaDatabaseException;
protected List<RssFeedEntry> processData( List<ArchivaArtifact> artifacts, boolean isRepoLevel )
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java Thu Jun 26 04:12:47 2008
@@ -48,11 +48,11 @@
public class NewArtifactsRssFeedProcessor
extends AbstractArtifactsRssFeedProcessor
{
- public static int numberOfDaysBeforeNow = 100;
+ private int numberOfDaysBeforeNow = 30;
- private String title = "New Artifacts in Repository ";
+ private static final String title = "New Artifacts in Repository ";
- private String desc = "These are the new artifacts found in the repository ";
+ private static final String desc = "These are the new artifacts found in the repository ";
/**
* @plexus.requirement
@@ -70,7 +70,7 @@
* Process the newly discovered artifacts in the repository. Generate feeds for new artifacts in the repository and
* new versions of artifact.
*/
- public SyndFeed process( Map<String, String> reqParams )
+ public SyndFeed process( Map<String, String> reqParams ) throws ArchivaDatabaseException
{
log.debug( "Process new artifacts into rss feeds." );
@@ -83,27 +83,19 @@
return null;
}
- private SyndFeed processNewArtifactsInRepo( String repoId )
+ private SyndFeed processNewArtifactsInRepo( String repoId ) throws ArchivaDatabaseException
{
- try
- {
- Calendar greaterThanThisDate = Calendar.getInstance( DateUtils.UTC_TIME_ZONE );
- greaterThanThisDate.add( Calendar.DATE, -numberOfDaysBeforeNow );
-
- Constraint artifactsByRepo = new ArtifactsByRepositoryConstraint( repoId, greaterThanThisDate.getTime(), "whenGathered" );
- List<ArchivaArtifact> artifacts = artifactDAO.queryArtifacts( artifactsByRepo );
+
+ Calendar greaterThanThisDate = Calendar.getInstance( DateUtils.UTC_TIME_ZONE );
+ greaterThanThisDate.add( Calendar.DATE, -( getNumberOfDaysBeforeNow() ) );
+
+ Constraint artifactsByRepo = new ArtifactsByRepositoryConstraint( repoId, greaterThanThisDate.getTime(), "whenGathered" );
+ List<ArchivaArtifact> artifacts = artifactDAO.queryArtifacts( artifactsByRepo );
- List<RssFeedEntry> entries = processData( artifacts, true );
+ List<RssFeedEntry> entries = processData( artifacts, true );
- return generator.generateFeed( getTitle() + "\'" + repoId + "\'", "New artifacts found in repository " +
- "\'" + repoId + "\'" + " during repository scan.", entries, "rss_feeds?repoId=" + repoId );
- }
- catch ( ArchivaDatabaseException ae )
- {
- log.error( ae.getMessage() );
- }
-
- return null;
+ return generator.generateFeed( getTitle() + "\'" + repoId + "\'", "New artifacts found in repository " +
+ "\'" + repoId + "\'" + " during repository scan.", entries );
}
public String getTitle()
@@ -135,4 +127,15 @@
{
this.artifactDAO = artifactDAO;
}
+
+ public int getNumberOfDaysBeforeNow()
+ {
+ return numberOfDaysBeforeNow;
+ }
+
+ public void setNumberOfDaysBeforeNow( int numberOfDaysBeforeNow )
+ {
+ this.numberOfDaysBeforeNow = numberOfDaysBeforeNow;
+ }
+
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java Thu Jun 26 04:12:47 2008
@@ -27,7 +27,6 @@
import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.database.ArtifactDAO;
import org.apache.maven.archiva.database.Constraint;
-import org.apache.maven.archiva.database.ObjectNotFoundException;
import org.apache.maven.archiva.database.constraints.ArtifactVersionsConstraint;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.slf4j.Logger;
@@ -47,9 +46,9 @@
public class NewVersionsOfArtifactRssFeedProcessor
extends AbstractArtifactsRssFeedProcessor
{
- private String title = "New Versions of Artifact ";
+ private static final String title = "New Versions of Artifact ";
- private String desc = "These are the new versions of artifact ";
+ private static final String desc = "These are the new versions of artifact ";
/**
* @plexus.requirement
@@ -66,7 +65,7 @@
/**
* Process all versions of the artifact which had a rss feed request.
*/
- public SyndFeed process( Map<String, String> reqParams )
+ public SyndFeed process( Map<String, String> reqParams ) throws ArchivaDatabaseException
{
String repoId = reqParams.get( RssFeedProcessor.KEY_REPO_ID );
String groupId = reqParams.get( RssFeedProcessor.KEY_GROUP_ID );
@@ -81,30 +80,17 @@
}
private SyndFeed processNewVersionsOfArtifact( String repoId, String groupId, String artifactId )
+ throws ArchivaDatabaseException
{
- try
- {
- Constraint artifactVersions = new ArtifactVersionsConstraint( repoId, groupId, artifactId, "whenGathered" );
- List<ArchivaArtifact> artifacts = artifactDAO.queryArtifacts( artifactVersions );
-
- List<RssFeedEntry> entries = processData( artifacts, false );
- String key = groupId + ":" + artifactId;
- return generator.generateFeed( getTitle() + "\'" + key + "\'", "New versions of artifact " + "\'" + key +
- "\' found in repository " + "\'" + repoId + "\'" + " during repository scan.", entries,
- "rss_feeds?groupId=" + groupId + "&artifactId=" + artifactId );
- }
- catch ( ObjectNotFoundException oe )
- {
- oe.printStackTrace();
- log.error( oe.getMessage() );
- }
- catch ( ArchivaDatabaseException ae )
- {
- ae.printStackTrace();
- log.error( ae.getMessage() );
- }
-
- return null;
+
+ Constraint artifactVersions = new ArtifactVersionsConstraint( repoId, groupId, artifactId, "whenGathered" );
+ List<ArchivaArtifact> artifacts = artifactDAO.queryArtifacts( artifactVersions );
+
+ List<RssFeedEntry> entries = processData( artifacts, false );
+ String key = groupId + ":" + artifactId;
+
+ return generator.generateFeed( getTitle() + "\'" + key + "\'", "New versions of artifact " + "\'" + key +
+ "\' found in repository " + "\'" + repoId + "\'" + " during repository scan.", entries );
}
public String getTitle()
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/RssFeedProcessor.java Thu Jun 26 04:12:47 2008
@@ -21,6 +21,8 @@
import java.util.Map;
+import org.apache.maven.archiva.database.ArchivaDatabaseException;
+
import com.sun.syndication.feed.synd.SyndFeed;
/**
@@ -37,5 +39,5 @@
public static final String KEY_ARTIFACT_ID = "artifactId";
- SyndFeed process( Map<String, String> reqParams );
+ SyndFeed process( Map<String, String> reqParams ) throws ArchivaDatabaseException;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java Thu Jun 26 04:12:47 2008
@@ -68,10 +68,10 @@
entries.add( entry );
SyndFeed feed =
- generator.generateFeed( "Test Feed", "The test feed from Archiva.", entries, "generated-rss2.0-feed.xml" );
+ generator.generateFeed( "Test Feed", "The test feed from Archiva.", entries );
assertEquals( "Test Feed", feed.getTitle() );
- assertEquals( "http://localhost:8080/archiva/rss/generated-rss2.0-feed.xml", feed.getLink() );
+ //assertEquals( "http://localhost:8080/archiva/rss/generated-rss2.0-feed.xml", feed.getLink() );
assertEquals( "The test feed from Archiva.", feed.getDescription() );
assertEquals( "en-us", feed.getLanguage() );
assertEquals( entries.get( 2 ).getPublishedDate(), feed.getPublishedDate() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java Thu Jun 26 04:12:47 2008
@@ -115,7 +115,7 @@
SyndFeed feed = newArtifactsProcessor.process( reqParams );
assertTrue( feed.getTitle().equals( "New Artifacts in Repository 'test-repo'" ) );
- assertTrue( feed.getLink().equals( "http://localhost:8080/archiva/rss/rss_feeds?repoId=test-repo" ) );
+ //assertTrue( feed.getLink().equals( "http://localhost:8080/archiva/rss/rss_feeds?repoId=test-repo" ) );
assertTrue( feed.getDescription().equals(
"New artifacts found in repository 'test-repo' during repository scan." ) );
assertTrue( feed.getLanguage().equals( "en-us" ) );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java Thu Jun 26 04:12:47 2008
@@ -93,8 +93,8 @@
SyndFeed feed = newVersionsProcessor.process( reqParams );
assertEquals( "New Versions of Artifact 'org.apache.archiva:artifact-two'", feed.getTitle() );
- assertEquals( "http://localhost:8080/archiva/rss/rss_feeds?groupId=org.apache.archiva&artifactId=artifact-two",
- feed.getLink() );
+ //assertEquals( "http://localhost:8080/archiva/rss/rss_feeds?groupId=org.apache.archiva&artifactId=artifact-two",
+ // feed.getLink() );
assertEquals(
"New versions of artifact 'org.apache.archiva:artifact-two' found in repository 'test-repo' during repository scan.",
feed.getDescription() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java?rev=671856&r1=671855&r2=671856&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java Thu Jun 26 04:12:47 2008
@@ -35,6 +35,7 @@
import org.apache.commons.codec.Decoder;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Base64;
+import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.security.AccessDeniedException;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.security.ArchivaSecurityException;
@@ -163,35 +164,37 @@
SyndFeedOutput output = new SyndFeedOutput();
output.output( feed, res.getWriter() );
}
+ catch ( ArchivaDatabaseException e )
+ {
+ log.debug( COULD_NOT_GENERATE_FEED_ERROR, e );
+ res.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, COULD_NOT_GENERATE_FEED_ERROR );
+ }
catch ( UserNotFoundException unfe )
{
- log.error( COULD_NOT_AUTHENTICATE_USER, unfe );
+ log.debug( COULD_NOT_AUTHENTICATE_USER, unfe );
res.sendError( HttpServletResponse.SC_UNAUTHORIZED, COULD_NOT_AUTHENTICATE_USER );
}
catch ( AccountLockedException acce )
- {
- log.error( COULD_NOT_AUTHENTICATE_USER, acce );
+ {
res.sendError( HttpServletResponse.SC_UNAUTHORIZED, COULD_NOT_AUTHENTICATE_USER );
}
catch ( AuthenticationException authe )
- {
- authe.printStackTrace();
- log.error( COULD_NOT_AUTHENTICATE_USER, authe );
+ {
+ log.debug( COULD_NOT_AUTHENTICATE_USER, authe );
res.sendError( HttpServletResponse.SC_UNAUTHORIZED, COULD_NOT_AUTHENTICATE_USER );
}
catch ( FeedException ex )
{
- log.error( COULD_NOT_GENERATE_FEED_ERROR, ex );
+ log.debug( COULD_NOT_GENERATE_FEED_ERROR, ex );
res.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, COULD_NOT_GENERATE_FEED_ERROR );
}
catch ( MustChangePasswordException e )
- {
- log.error( COULD_NOT_AUTHENTICATE_USER, e );
+ {
res.sendError( HttpServletResponse.SC_UNAUTHORIZED, COULD_NOT_AUTHENTICATE_USER );
}
catch ( UnauthorizedException e )
{
- log.error( e.getMessage() );
+ log.debug( e.getMessage() );
if ( repoId != null )
{
res.setHeader("WWW-Authenticate", "Basic realm=\"Repository Archiva Managed " + repoId + " Repository" );
@@ -240,7 +243,7 @@
}
catch ( DecoderException ie )
{
- log.error( "Error decoding username and password.", ie.getMessage() );
+ log.warn( "Error decoding username and password.", ie.getMessage() );
}
if ( usernamePassword == null || usernamePassword.trim().equals( "" ) )
@@ -278,11 +281,11 @@
}
catch ( AuthorizationException e )
{
- log.error( "Fatal Authorization Subsystem Error." );
+
}
catch ( UnauthorizedException e )
{
- log.error( e.getMessage() );
+
}
}