You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/10/31 18:13:53 UTC
svn commit: r709483 - in /maven/mercury/trunk/mercury-plexus/src: main/java/org/apache/ main/java/org/apache/maven/ main/java/org/apache/maven/mercury/ main/java/org/apache/maven/mercury/plexus/ main/java/org/codehaus/plexus/components/mercury/ test/ja...

Author: ogusakov
Date: Fri Oct 31 10:13:52 2008
New Revision: 709483

URL: http://svn.apache.org/viewvc?rev=709483&view=rev
Log:
refactoring packages

Added:
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/   (props changed)
      - copied from r709473, maven/mercury/trunk/mercury-plexus/src/main/java/org/codehaus/plexus/components/mercury/
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/Messages.properties
      - copied unchanged from r709476, maven/mercury/trunk/mercury-plexus/src/main/java/org/codehaus/plexus/components/mercury/Messages.properties
    maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/
    maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/
    maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/
    maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/   (props changed)
      - copied from r709473, maven/mercury/trunk/mercury-plexus/src/test/java/org/codehaus/plexus/components/mercury/
Removed:
    maven/mercury/trunk/mercury-plexus/src/main/java/org/codehaus/plexus/components/mercury/DefaultPlexusMercury.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/codehaus/plexus/components/mercury/Messages.properties
    maven/mercury/trunk/mercury-plexus/src/main/java/org/codehaus/plexus/components/mercury/PlexusMercury.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/codehaus/plexus/components/mercury/PlexusMercuryException.java
    maven/mercury/trunk/mercury-plexus/src/test/java/org/codehaus/plexus/components/mercury/
Modified:
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercuryException.java
    maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java

Propchange: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=709483&r1=709473&r2=709483&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Fri Oct 31 10:13:52 2008
@@ -1,20 +1,4 @@
-package org.codehaus.plexus.components.mercury;
-
-/*
- * Copyright 2001-2007 Codehaus Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package org.apache.maven.mercury.plexus;
 
 import java.io.File;
 import java.io.InputStream;

Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java?rev=709483&r1=709473&r2=709483&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java Fri Oct 31 10:13:52 2008
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.components.mercury;
+package org.apache.maven.mercury.plexus;
 
 import java.io.File;
 import java.io.InputStream;
@@ -9,7 +9,6 @@
 
 import org.apache.maven.mercury.artifact.Artifact;
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
-import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
 import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.crypto.api.StreamObserverFactory;
@@ -21,22 +20,6 @@
 import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
 import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
 
-/*
- * Copyright 2001-2007 Codehaus Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 /**
  * 
  * @author Oleg Gusakov

Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercuryException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercuryException.java?rev=709483&r1=709473&r2=709483&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercuryException.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercuryException.java Fri Oct 31 10:13:52 2008
@@ -1,7 +1,7 @@
-package org.codehaus.plexus.components.mercury;
+package org.apache.maven.mercury.plexus;
 
 public class PlexusMercuryException
-    extends Exception
+extends Exception
 {
 
   public PlexusMercuryException()

Propchange: maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=709483&r1=709473&r2=709483&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Fri Oct 31 10:13:52 2008
@@ -1,28 +1,4 @@
-package org.codehaus.plexus.components.mercury;
-
-/*
- * The MIT License
- *
- * Copyright (c) 2005, The Codehaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+package org.apache.maven.mercury.plexus;
 
 import java.io.File;
 import java.net.URL;
@@ -42,6 +18,8 @@
 import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
 import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
 import org.apache.maven.mercury.crypto.sha.SHA1VerifierFactory;
+import org.apache.maven.mercury.plexus.DefaultPlexusMercury;
+import org.apache.maven.mercury.plexus.PlexusMercury;
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.api.RepositoryException;
 import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;