You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2007/11/26 19:52:54 UTC
svn commit: r598380 [1/2] - in /maven/sandbox/trunk/archetypeng:
archetype-testing/
archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/
archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/reposi...
Author: rafale
Date: Mon Nov 26 10:52:51 2007
New Revision: 598380
URL: http://svn.apache.org/viewvc?rev=598380&view=rev
Log:
Catalog retrieving API and tests
Added:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java (with props)
Removed:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/GavCalculator.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreationConfiguratorTest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerationConfiguratorTest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeSelectorTest.java
Modified:
maven/sandbox/trunk/archetypeng/archetype-testing/ (props changed)
maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
maven/sandbox/trunk/archetypeng/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSink.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-common.mdo
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeSelectionQueryer.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
Propchange: maven/sandbox/trunk/archetypeng/archetype-testing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 26 10:52:51 2007
@@ -0,0 +1 @@
+target
Modified: maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java Mon Nov 26 10:52:51 2007
@@ -16,6 +16,7 @@
*/
package org.apache.maven.archetype.proxy;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -36,6 +37,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.mortbay.util.IO;
+
/**
* Stolen code from Mortbay
*
@@ -44,9 +46,8 @@
public class ProxyServlet
extends HttpServlet
{
- private int _tunnelTimeoutMs = 300000;
+ protected HashSet _DontProxyHeaders = new HashSet();
- protected HashSet _DontProxyHeaders = new HashSet( );
{
_DontProxyHeaders.add( "proxy-connection" );
_DontProxyHeaders.add( "connection" );
@@ -58,6 +59,7 @@
_DontProxyHeaders.add( "proxy-authenticate" );
_DontProxyHeaders.add( "upgrade" );
}
+
private ServletConfig config;
private ServletContext context;
@@ -65,16 +67,17 @@
/* (non-Javadoc)
* @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
*/
- public void init( ServletConfig config ) throws ServletException
+ public void init( ServletConfig config )
+ throws ServletException
{
this.config = config;
- this.context = config.getServletContext( );
+ this.context = config.getServletContext();
}
/* (non-Javadoc)
* @see javax.servlet.Servlet#getServletConfig()
*/
- public ServletConfig getServletConfig( )
+ public ServletConfig getServletConfig()
{
return config;
}
@@ -82,29 +85,31 @@
/* (non-Javadoc)
* @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
*/
- public void service( ServletRequest req, ServletResponse res ) throws ServletException,
- IOException
+ public void service( ServletRequest req, ServletResponse res )
+ throws ServletException,
+ IOException
{
HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) res;
- if ( "CONNECT".equalsIgnoreCase( request.getMethod( ) ) )
+ if ( "CONNECT".equalsIgnoreCase( request.getMethod() ) )
{
handleConnect( request, response );
}
else
{
- String uri = request.getRequestURI( );
- if ( request.getQueryString( ) != null )
+ String uri = request.getRequestURI();
+ if ( request.getQueryString() != null )
{
- uri += "?" + request.getQueryString( );
+ uri += "?" + request.getQueryString();
}
URL url =
- new URL( request.getScheme( ), request.getServerName( ), request.getServerPort( ),
+ new URL( request.getScheme(), request.getServerName(),
+ request.getServerPort(),
uri );
context.log( "\n\n\nURL=" + url );
- URLConnection connection = url.openConnection( );
+ URLConnection connection = url.openConnection();
connection.setAllowUserInteraction( false );
// Set method
@@ -112,7 +117,7 @@
if ( connection instanceof HttpURLConnection )
{
http = (HttpURLConnection) connection;
- http.setRequestMethod( request.getMethod( ) );
+ http.setRequestMethod( request.getMethod() );
http.setInstanceFollowRedirects( false );
}
@@ -120,7 +125,7 @@
String connectionHdr = request.getHeader( "Connection" );
if ( connectionHdr != null )
{
- connectionHdr = connectionHdr.toLowerCase( );
+ connectionHdr = connectionHdr.toLowerCase();
if ( connectionHdr.equals( "keep-alive" ) || connectionHdr.equals( "close" ) )
{
connectionHdr = null;
@@ -130,12 +135,12 @@
// copy headers
boolean xForwardedFor = false;
boolean hasContent = false;
- Enumeration enm = request.getHeaderNames( );
- while ( enm.hasMoreElements( ) )
+ Enumeration enm = request.getHeaderNames();
+ while ( enm.hasMoreElements() )
{
// TODO could be better than this!
String hdr = (String) enm.nextElement();
- String lhdr = hdr.toLowerCase( );
+ String lhdr = hdr.toLowerCase();
if ( _DontProxyHeaders.contains( lhdr ) )
{
@@ -150,7 +155,7 @@
hasContent = true;
}
Enumeration vals = request.getHeaders( hdr );
- while ( vals.hasMoreElements( ) )
+ while ( vals.hasMoreElements() )
{
String val = (String) vals.nextElement();
if ( val != null )
@@ -166,7 +171,7 @@
connection.setRequestProperty( "Via", "1.1 (jetty)" );
if ( !xForwardedFor )
{
- connection.addRequestProperty( "X-Forwarded-For", request.getRemoteAddr( ) );
+ connection.addRequestProperty( "X-Forwarded-For", request.getRemoteAddr() );
}
// a little bit of cache control
String cache_control = request.getHeader( "Cache-Control" );
@@ -175,22 +180,22 @@
{
connection.setUseCaches( false );
- // customize Connection
+ // customize Connection
}
try
{
connection.setDoInput( true );
// do input thang!
- InputStream in = request.getInputStream( );
+ InputStream in = request.getInputStream();
if ( hasContent )
{
connection.setDoOutput( true );
- IO.copy( in, connection.getOutputStream( ) );
+ IO.copy( in, connection.getOutputStream() );
}
// Connect
- connection.connect( );
+ connection.connect();
}
catch ( Exception e )
{
@@ -203,23 +208,23 @@
int code = 500;
if ( http != null )
{
- proxy_in = http.getErrorStream( );
+ proxy_in = http.getErrorStream();
- code = http.getResponseCode( );
- response.setStatus( code, http.getResponseMessage( ) );
- context.log( "response = " + http.getResponseCode( ) );
+ code = http.getResponseCode();
+ response.setStatus( code, http.getResponseMessage() );
+ context.log( "response = " + http.getResponseCode() );
}
if ( proxy_in == null )
{
try
{
- proxy_in = connection.getInputStream( );
+ proxy_in = connection.getInputStream();
}
catch ( Exception e )
{
context.log( "stream", e );
- proxy_in = http.getErrorStream( );
+ proxy_in = http.getErrorStream();
}
}
@@ -233,7 +238,7 @@
String val = connection.getHeaderField( h );
while ( hdr != null || val != null )
{
- String lhdr = hdr != null ? hdr.toLowerCase( ) : null;
+ String lhdr = hdr != null ? hdr.toLowerCase() : null;
if ( hdr != null && val != null && !_DontProxyHeaders.contains( lhdr ) )
{
response.addHeader( hdr, val );
@@ -249,16 +254,17 @@
// Handle
if ( proxy_in != null )
{
- IO.copy( proxy_in, response.getOutputStream( ) );
+ IO.copy( proxy_in, response.getOutputStream() );
}
}
}
/* ------------------------------------------------------------ */
public void handleConnect( HttpServletRequest request,
- HttpServletResponse response ) throws IOException
+ HttpServletResponse response )
+ throws IOException
{
- String uri = request.getRequestURI( );
+ String uri = request.getRequestURI();
context.log( "CONNECT: " + uri );
@@ -276,41 +282,31 @@
}
}
-
-
-
InetSocketAddress inetAddress =
new InetSocketAddress( host, Integer.parseInt( port ) );
- //if (isForbidden(HttpMessage.__SSL_SCHEME,addrPort.getHost(),addrPort.getPort(),false))
- //{
- // sendForbid(request,response,uri);
- //}
- //else
- {
- InputStream in = request.getInputStream( );
- OutputStream out = response.getOutputStream( );
+ InputStream in = request.getInputStream();
+ OutputStream out = response.getOutputStream();
- Socket socket = new Socket( inetAddress.getAddress( ), inetAddress.getPort( ) );
- context.log( "Socket: " + socket );
+ Socket socket = new Socket( inetAddress.getAddress(), inetAddress.getPort() );
+ context.log( "Socket: " + socket );
- response.setStatus( 200 );
- response.setHeader( "Connection", "close" );
- response.flushBuffer( );
+ response.setStatus( 200 );
+ response.setHeader( "Connection", "close" );
+ response.flushBuffer();
- context.log( "out<-in" );
- IO.copyThread( socket.getInputStream( ), out );
- context.log( "in->out" );
- IO.copy( in, socket.getOutputStream( ) );
- }
+ context.log( "out<-in" );
+ IO.copyThread( socket.getInputStream(), out );
+ context.log( "in->out" );
+ IO.copy( in, socket.getOutputStream() );
}
/* (non-Javadoc)
* @see javax.servlet.Servlet#getServletInfo()
*/
- public String getServletInfo( )
+ public String getServletInfo()
{
return "Proxy Servlet";
}
@@ -318,7 +314,7 @@
/* (non-Javadoc)
* @see javax.servlet.Servlet#destroy()
*/
- public void destroy( )
+ public void destroy()
{
}
@@ -328,26 +324,27 @@
* @param response servlet response
*/
protected void processRequest( HttpServletRequest request,
- HttpServletResponse response ) throws ServletException, IOException
+ HttpServletResponse response )
+ throws ServletException, IOException
{
response.setContentType( "text/html;charset=UTF-8" );
- PrintWriter out = response.getWriter( );
+ PrintWriter out = response.getWriter();
try
{
- /* TODO output your page here
- out.println("<html>");
- out.println("<head>");
- out.println("<title>Servlet ProxyServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<h1>Servlet ProxyServlet at " + request.getContextPath () + "</h1>");
- out.println("</body>");
- out.println("</html>");
- */
+ /* TODO output your page here
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Servlet ProxyServlet</title>");
+ out.println("</head>");
+ out.println("<body>");
+ out.println("<h1>Servlet ProxyServlet at " + request.getContextPath () + "</h1>");
+ out.println("</body>");
+ out.println("</html>");
+ */
}
finally
{
- out.close( );
+ out.close();
}
}
@@ -382,4 +379,4 @@
// return "Short description";
// }
// // </editor-fold>
-}
\ No newline at end of file
+}
Modified: maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java Mon Nov 26 10:52:51 2007
@@ -69,31 +69,32 @@
{
HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) res;
-
-
-
- log( "A = " + request.getAuthType() );
- log( "A = " + request.getCharacterEncoding() );
- log( "A = " + request.getContentType() );
- log( "B = " + request.getContextPath() );
- log( "B = " + request.getLocalAddr() );
- log( "B = " + request.getLocalName() );
- log( "C = " + request.getMethod() );
- log( "C = " + request.getPathInfo() );
- log( "C = " + request.getPathTranslated() );
- log( "D = " + request.getProtocol() );
- log( "D = " + request.getQueryString() );
- log( "D = " + request.getRemoteAddr() );
- log( "E = " + request.getRemoteHost() );
- log( "E = " + request.getRemoteUser() );
- log( "E = " + request.getRequestURI() );
- log( "F = " + request.getRequestedSessionId() );
- log( "F = " + request.getScheme() );
- log( "F = " + request.getServerName() );
- log( "G = " + request.getServletPath() );
- log( "G = " + request.getAttributeNames() );
- log( "G = " + request.getCookies() );
- log( "H = " + request.getHeaderNames() );
+
+
+
+// log( "A = " + request.getAuthType() );
+// log( "A = " + request.getCharacterEncoding() );
+// log( "A = " + request.getContentType() );
+// log( "B = " + request.getContextPath() );
+// log( "B = " + request.getLocalAddr() );
+// log( "B = " + request.getLocalName() );
+// log( "C = " + request.getMethod() );
+// log( "C = " + request.getPathInfo() );
+// log( "C = " + request.getPathTranslated() );
+// log( "D = " + request.getProtocol() );
+// log( "D = " + request.getQueryString() );
+// log( "D = " + request.getRemoteAddr() );
+// log( "E = " + request.getRemoteHost() );
+// log( "E = " + request.getRemoteUser() );
+// log( "E = " + request.getRequestURI() );
+// log( "F = " + request.getRequestedSessionId() );
+// log( "F = " + request.getScheme() );
+// log( "F = " + request.getServerName() );
+// log( "G = " + request.getServletPath() );
+// log( "G = " + request.getAttributeNames() );
+// log( "G = " + request.getCookies() );
+// log( "H = " + request.getHeaderNames() );
+
// log( "H = " + request.get );
// log( "H = " + request.get );
// log( "I = " + request.get );
@@ -105,17 +106,17 @@
// log( "K = " + request.get );
// log( "K = " + request.get );
// log( "K = " + request.get );
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
response.setHeader( "Date", null );
response.setHeader( "Server", null );
@@ -263,6 +264,6 @@
{
return "Repository Servlet";
}
-
-
+
+
}
Modified: maven/sandbox/trunk/archetypeng/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java Mon Nov 26 10:52:51 2007
@@ -163,7 +163,6 @@
}
else
{
-
response.setStatus( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
try
{
@@ -179,18 +178,18 @@
StringWriter w = new StringWriter( );
IO.copy( request.getReader( ), w );
log( "Content " + w.toString( ) );
-
-
- System.err.println( "Method " + request.getMethod( ) );
- System.err.println( "ContextPath " + request.getContextPath( ) );
- System.err.println( "QueryString" + request.getQueryString( ) );
- System.err.println( "PathInfo " + request.getPathInfo( ) );
- System.err.println( "ServletPath " + request.getServletPath( ) );
- System.err.println( "AttributeNames " + request.getAttributeNames( ).toString( ) );
- System.err.println( "HeaderNames " + request.getHeaderNames( ).toString( ) );
- System.err.println( "RequestURL " + request.getRequestURL( ).toString( ) );
- System.err.println( "ParameterNames " + request.getParameterNames( ).toString( ) );
- System.err.println( "Content " + w.toString( ) );
+
+
+// System.err.println( "Method " + request.getMethod( ) );
+// System.err.println( "ContextPath " + request.getContextPath( ) );
+// System.err.println( "QueryString" + request.getQueryString( ) );
+// System.err.println( "PathInfo " + request.getPathInfo( ) );
+// System.err.println( "ServletPath " + request.getServletPath( ) );
+// System.err.println( "AttributeNames " + request.getAttributeNames( ).toString( ) );
+// System.err.println( "HeaderNames " + request.getHeaderNames( ).toString( ) );
+// System.err.println( "RequestURL " + request.getRequestURL( ).toString( ) );
+// System.err.println( "ParameterNames " + request.getParameterNames( ).toString( ) );
+// System.err.println( "Content " + w.toString( ) );
}
catch ( IOException iOException )
{
@@ -249,6 +248,6 @@
{
return "Repository Servlet";
}
-
-
+
+
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml Mon Nov 26 10:52:51 2007
@@ -409,4 +409,13 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java Mon Nov 26 10:52:51 2007
@@ -16,15 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.maven.archetype;
+
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
/** @author Jason van Zyl */
public interface Archetype
@@ -49,24 +50,40 @@
*/
ArchetypeGenerationResult generateProjectFromArchetype( ArchetypeGenerationRequest request );
-// /**
-// * Get all available archetypes using the standard ~/.m2/archetype-catalog.properties as the
-// * definition for the sources to be used and the configuration for each
-// * {@org.apache.maven.archetype.source.ArchetypeDataSource} listed.
-// *
-// * @return A Map of available archetypes collected from all available source.
-// */
-// List getAvailableArchetypes();
+ /**
+ * Gives the catalog of archetypes internal to the plugin.
+ * @return the catalog.
+ */
+ ArchetypeCatalog getInternalCatalog();
/**
- * Get all available archetypes using a specified catalog properties as the
- * definition for the sources to be used and the configuration for each
- * {@org.apache.maven.archetype.source.ArchetypeDataSource} listed.
- *
- * @param properties
- * @return A Map of available archetypes collected from all available source.
+ * Gives the catalog of archetypes located in $user.home/.m2/repository/archetype-catalog.xml.
+ * @return the catalog.
+ */
+ ArchetypeCatalog getDefaultLocalCatalog();
+
+ /**
+ * Gives the catalog of archetypes located in the given path.
+ * if path is a file, it used as is.
+ * if path is a directory, archetype-catalog.xml is appended to it.
+ * @param path the catalog file path or directory containing the catalog file.
+ * @return the catalog.
+ */
+ ArchetypeCatalog getLocalCatalog( String path );
+
+ /**
+ * Gives the catalog of archetypes located at http://repo1.maven.org/maven2/archetype-catalog.xml.
+ * @return the catalog.
+ */
+ ArchetypeCatalog getRemoteCatalog();
+
+ /**
+ * Gives the catalog of archetypes located at the given url.
+ * if the url doesn't define a catalog, then 'archetype-catalog.xml' is appended to it for search.
+ * @param url the catalog url or base url containing the catalog file.
+ * @return the catalog.
*/
- List getAvailableArchetypes( Properties properties );
+ ArchetypeCatalog getRemoteCatalog( String url );
/**
* Creates a jar file for an archetype.
@@ -84,4 +101,4 @@
File outputDirectory,
String finalName )
throws DependencyResolutionRequiredException, IOException;
-}
\ No newline at end of file
+}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java Mon Nov 26 10:52:51 2007
@@ -19,6 +19,7 @@
package org.apache.maven.archetype;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.creator.ArchetypeCreator;
import org.apache.maven.archetype.generator.ArchetypeGenerator;
import org.apache.maven.archetype.source.ArchetypeDataSource;
@@ -76,99 +77,6 @@
return result;
}
-// public Collection getArchetypes( ArchetypeDataSource source,
-// Properties sourceConfiguration )
-// throws ArchetypeDataSourceException
-// {
-// return source.getArchetypes( sourceConfiguration );
-// }
-
-// public Collection getArchetypeDataSources()
-// {
-// return archetypeSources.values();
-// }
-
-// public List getAvailableArchetypes()
-// {
-// File archetypeCatalogPropertiesFile = new File( System.getProperty( "user.home" ),
-// ".m2/archetype-catalog.properties" );
-//
-// Properties archetypeCatalogProperties;
-//
-// if ( archetypeCatalogPropertiesFile.exists() )
-// {
-// archetypeCatalogProperties = PropertyUtils.loadProperties( archetypeCatalogPropertiesFile );
-// }
-// else
-// {
-// archetypeCatalogProperties = new Properties();
-// }
-//
-// return getAvailableArchetypes( archetypeCatalogProperties );
-// }
-
- public List getAvailableArchetypes( Properties archetypeCatalogProperties )
- {
- List archetypes = new ArrayList();
-
- String[] sources = StringUtils.split( archetypeCatalogProperties.getProperty( "sources" ), "," );
-
- for ( int i = 0; i < sources.length; i++ )
- {
- String sourceRoleHint = sources[i];
-
- try
- {
- ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( sourceRoleHint );
-
- archetypes.addAll( source.getArchetypes(
- getArchetypeDataSourceProperties( sourceRoleHint, archetypeCatalogProperties ) ) );
- }
- catch ( ArchetypeDataSourceException e )
- {
- // do nothing, gracefully move on
- }
- }
-
- // If we haven't found any Archetypes then we will currently attempt to use the Wiki source.
- // Eventually we will use a more reliable remote catalog from the central repository.
- if ( archetypes.size() == 0 )
- {
- try
- {
- ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "internal-catalog" );
-
- archetypes.addAll( source.getArchetypes( new Properties() ) );
- }
- catch ( ArchetypeDataSourceException e )
- {
- // do nothing, gracefully move on
- }
- }
-
- return archetypes;
- }
-
- public Properties getArchetypeDataSourceProperties( String sourceRoleHint,
- Properties archetypeCatalogProperties )
- {
- Properties p = new Properties();
-
- for ( Iterator i = archetypeCatalogProperties.keySet().iterator(); i.hasNext(); )
- {
- String key = (String) i.next();
-
- if ( key.startsWith( sourceRoleHint ) )
- {
- String k = key.substring( sourceRoleHint.length() + 1 );
-
- p.setProperty( k, archetypeCatalogProperties.getProperty( key ) );
- }
- }
-
- return p;
- }
-
public File archiveArchetype( File archetypeDirectory,
File outputDirectory,
String finalName )
@@ -239,6 +147,62 @@
zos.closeEntry();
}
+ }
+ }
+
+ public ArchetypeCatalog getInternalCatalog()
+ {
+ try
+ {
+ ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "internal-catalog" );
+
+ return source.getArchetypeCatalog( new Properties() );
+ }
+ catch ( ArchetypeDataSourceException e )
+ {
+ return new ArchetypeCatalog();
+ }
+ }
+
+ public ArchetypeCatalog getDefaultLocalCatalog()
+ {
+ return getLocalCatalog("${user.home}/.m2/archetype-catalog.xml");
+ }
+
+ public ArchetypeCatalog getLocalCatalog( String path )
+ {
+ try
+ {
+ Properties properties=new Properties();
+ properties.setProperty("file", path);
+ ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "catalog" );
+
+ return source.getArchetypeCatalog( properties );
+ }
+ catch ( ArchetypeDataSourceException e )
+ {
+ return new ArchetypeCatalog();
+ }
+ }
+
+ public ArchetypeCatalog getRemoteCatalog()
+ {
+ return getRemoteCatalog("http://repo1.maven.org/maven2");
+ }
+
+ public ArchetypeCatalog getRemoteCatalog( String url )
+ {
+ try
+ {
+ Properties properties=new Properties();
+ properties.setProperty("repository", url);
+ ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( "remote-catalog" );
+
+ return source.getArchetypeCatalog( properties );
+ }
+ catch ( ArchetypeDataSourceException e )
+ {
+ return new ArchetypeCatalog();
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java Mon Nov 26 10:52:51 2007
@@ -64,32 +64,24 @@
throws
UnknownArchetype;
-// /**
-// */
-// List getArchetypes( String groupId,
-// ArtifactRepository localRepository,
-// List repositories )
-// throws
-// UnknownGroup;
-
/**
*/
ZipFile getArchetypeZipFile( File archetypeFile )
throws
UnknownArchetype;
- /**
- */
- ZipFile getArchetypeZipFile(
- String groupId,
- String artifactId,
- String version,
- ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype;
+// /**
+// */
+// ZipFile getArchetypeZipFile(
+// String groupId,
+// String artifactId,
+// String version,
+// ArtifactRepository archetypeRepository,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownArchetype;
boolean exists(
String archetypeGroupId,
@@ -99,11 +91,6 @@
ArtifactRepository localRepository,
List repos );
-
-// boolean exists( ArchetypeDefinition ad,
-// ArtifactRepository localRepository,
-// List remoteRepositories );
-
boolean isFileSetArchetype(
String groupId,
String artifactId,
@@ -138,19 +125,6 @@
throws
UnknownArchetype;
-// /**
-// */
-// List getFilesetArchetypeResources(
-// String groupId,
-// String artifactId,
-// String version,
-// ArtifactRepository archetypeRepository,
-// ArtifactRepository localRepository,
-// List repositories
-// )
-// throws
-// UnknownArchetype;
-
/**
*/
boolean isOldArchetype(
@@ -174,26 +148,4 @@
)
throws
UnknownArchetype;
-
-// /**
-// */
-// String getReleaseVersion(
-// String groupId,
-// String artifactId,
-// ArtifactRepository localRepository,
-// List repositories
-// )
-// throws
-// UnknownArchetype;
-
-// /**
-// */
-// List getVersions(
-// String groupId,
-// String artifactId,
-// ArtifactRepository localRepository,
-// List repositories
-// )
-// throws
-// UnknownArchetype;
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java Mon Nov 26 10:52:51 2007
@@ -71,7 +71,7 @@
throws
IOException;
- ArchetypeRegistry getDefaultArchetypeRegistry();
+ ArchetypeRegistry getDefaultArchetypeRegistry();
ArtifactRepository createRepository( String url, String repositoryId );
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java Mon Nov 26 10:52:51 2007
@@ -134,55 +134,6 @@
}
}
-// public List getArchetypes(
-// String groupId,
-// ArtifactRepository localRepository,
-// List repositories
-// )
-// throws
-// UnknownGroup
-// {
-// try
-// {
-// List archetypes = new ArrayList();
-//
-// RepositoryMetadata metadata = new GroupRepositoryMetadata( groupId );
-//
-// repositoryMetadataManager.resolve( metadata, repositories, localRepository );
-//
-// for ( Iterator iter = metadata.getMetadata().getPlugins().iterator(); iter.hasNext(); )
-// {
-// Plugin plugin = (Plugin) iter.next();
-//
-// Archetype archetype = new Archetype();
-//
-// archetype.setGroupId( groupId );
-//
-// archetype.setArtifactId( plugin.getArtifactId() );
-//
-// archetype.setName( plugin.getName() );
-//
-// archetype.setPrefix( plugin.getPrefix() );
-//
-// if ( getLogger().isDebugEnabled() )
-// {
-// getLogger().debug( "plugin=" + groupId + ":" + plugin.getArtifactId() );
-// }
-//
-// if ( !archetypes.contains( archetype ) )
-// {
-// archetypes.add( archetype );
-// }
-// } // end for
-//
-// return archetypes;
-// }
-// catch ( RepositoryMetadataResolutionException e )
-// {
-// throw new UnknownGroup( e );
-// }
-// }
-
public ZipFile getArchetypeZipFile( File archetypeFile )
throws
UnknownArchetype
@@ -201,45 +152,16 @@
}
}
- public ZipFile getArchetypeZipFile(
- String groupId,
- String artifactId,
- String version,
- ArtifactRepository archetypeRepository,
+ public boolean exists(
+ String archetypeGroupId,
+ String archetypeArtifactId,
+ String archetypeVersion,
+ ArtifactRepository archetypeRepository,
ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype
- {
- try
- {
- File archetypeFile =
- getArchetypeFile( groupId, artifactId, version, archetypeRepository, localRepository, repositories );
-
- return new ZipFile( archetypeFile );
- }
- catch ( ZipException e )
- {
-
- throw new UnknownArchetype( e );
- }
- catch ( IOException e )
- {
- throw new UnknownArchetype( e );
- }
- }
-
- public boolean exists(
- String archetypeGroupId,
- String archetypeArtifactId,
- String archetypeVersion,
- ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository,
List remoteRepositories )
{
try
- {
+ {
File archetypeFile = downloader.download( archetypeGroupId, archetypeArtifactId, archetypeVersion, archetypeRepository, localRepository, remoteRepositories );
return archetypeFile.exists();
@@ -387,44 +309,6 @@
return archetypeResources;
}
-// public List getFilesetArchetypeResources(
-// String groupId,
-// String artifactId,
-// String version,
-// ArtifactRepository archetypeRepository,
-// ArtifactRepository localRepository,
-// List repositories
-// )
-// throws
-// UnknownArchetype
-// {
-// List archetypeResources = new ArrayList();
-//
-// ZipFile zipFile =
-// getArchetypeZipFile( groupId, artifactId, version, archetypeRepository, localRepository, repositories );
-//
-// Enumeration enumeration = zipFile.entries();
-// while ( enumeration.hasMoreElements() )
-// {
-// ZipEntry entry = (ZipEntry) enumeration.nextElement();
-//
-// if ( !entry.isDirectory()
-// && entry.getName().startsWith( Constants.ARCHETYPE_RESOURCES )
-// )
-// {
-// // not supposed to be file.seperator
-// archetypeResources.add(
-// StringUtils.replace(
-// entry.getName(),
-// Constants.ARCHETYPE_RESOURCES + "/",
-// ""
-// )
-// );
-// }
-// }
-// return archetypeResources;
-// }
-
public boolean isOldArchetype(
String groupId,
String artifactId,
@@ -497,54 +381,6 @@
throw new UnknownArchetype( e );
}
}
-
-// public String getReleaseVersion(
-// String groupId,
-// String artifactId,
-// ArtifactRepository localRepository,
-// List repositories
-// )
-// throws
-// UnknownArchetype
-// {
-// try
-// {
-// RepositoryMetadata metadata =
-// new GroupRepositoryMetadata( groupId + "." + artifactId );
-//
-// repositoryMetadataManager.resolve( metadata, repositories, localRepository );
-//
-// return metadata.getMetadata().getVersioning().getRelease();
-// }
-// catch ( RepositoryMetadataResolutionException e )
-// {
-// throw new UnknownArchetype( e );
-// }
-// }
-
-// public List getVersions(
-// String groupId,
-// String artifactId,
-// ArtifactRepository localRepository,
-// List repositories
-// )
-// throws
-// UnknownArchetype
-// {
-// try
-// {
-// RepositoryMetadata metadata =
-// new GroupRepositoryMetadata( groupId + "." + artifactId );
-//
-// repositoryMetadataManager.resolve( metadata, repositories, localRepository );
-//
-// return metadata.getMetadata().getVersioning().getVersions();
-// }
-// catch ( RepositoryMetadataResolutionException e )
-// {
-// throw new UnknownArchetype( e );
-// }
-// }
private Reader getArchetypeDescriptorReader( ClassLoader archetypeJarLoader )
throws
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java Mon Nov 26 10:52:51 2007
@@ -135,14 +135,6 @@
return languages;
}
-// public ArchetypeRegistry readArchetypeRegistry()
-// throws
-// IOException,
-// XmlPullParserException
-// {
-// return readArchetypeRegistry( DEFAULT_REGISTRY );
-// }
-
public ArchetypeRegistry readArchetypeRegistry( File archetypeRegistryFile )
throws
IOException,
@@ -174,32 +166,6 @@
IOUtil.close( reader );
}
}
-
-// public List getRepositories(
-// List pomRemoteRepositories,
-// String remoteRepositories,
-// File archetypeRegistryFile
-// )
-// throws
-// IOException,
-// XmlPullParserException
-// {
-// List archetypeRemoteRepositories = new ArrayList( pomRemoteRepositories );
-//
-// if ( remoteRepositories != null )
-// {
-// archetypeRemoteRepositories = new ArrayList();
-//
-// String[] s = StringUtils.split( remoteRepositories, "," );
-//
-// for ( int i = 0; i < s.length; i++ )
-// {
-// archetypeRemoteRepositories.add( createRepository( s[i], "id" + i ) );
-// }
-// }
-//
-// return archetypeRemoteRepositories;
-// }
public void writeArchetypeRegistry(
File archetypeRegistryFile,
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java Mon Nov 26 10:52:51 2007
@@ -84,11 +84,6 @@
{
String[] prob = det.getProbableCharsets();
-// if ( Arrays.asList ( prob ).contains ( "windows-1252" ) )
-// {
-// charset = "ISO-8859-1";
-// }
-// else
if ( prob.length > 0 )
{
charset = prob[0];
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java Mon Nov 26 10:52:51 2007
@@ -142,7 +142,7 @@
ac.setVersion( ad.getVersion() );
- ac.setGoals( ad.getGoals() );
+ ac.setGoals( ad.getGoals() );
if ( !ac.isConfigured() )
{
@@ -1510,20 +1510,6 @@
return groups;
}
-// private Properties initialiseArchetypeProperties( File propertyFile )
-// throws
-// IOException
-// {
-// Properties properties = new Properties();
-//
-// if ( propertyFile != null && propertyFile.exists() )
-// {
-// archetypePropertiesManager.readProperties( properties, propertyFile );
-// }
-//
-// return properties;
-// }
-
private FileSet getPackagedFileSet(
final boolean filtered,
final Set packagedExtensions,
@@ -1680,7 +1666,6 @@
new FileOutputStream( outputFile ),
fileEncoding
);
-// FileUtils.fileWrite ( outputFile.getAbsolutePath (), content );
} // end while
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java Mon Nov 26 10:52:51 2007
@@ -102,9 +102,6 @@
request.getArchetypeArtifactId() + "-repo" );
repos.add( remoteRepo );
-
- System.err.println("REPO"+remoteRepo);
-
}
if ( !archetypeArtifactManager.exists(
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java Mon Nov 26 10:52:51 2007
@@ -92,17 +92,14 @@
{
ArchetypeDescriptor archetypeDescriptor =
archetypeArtifactManager.getFileSetArchetypeDescriptor( archetypeFile );
-//XXX HERE use the request
-// ArchetypeConfiguration archetypeConfiguration =
-// archetypeFactory.createArchetypeConfiguration( archetypeDescriptor, properties );
-//archetypeConfiguration.isConfigured()
+
if ( !isArchetypeConfigured( archetypeDescriptor, request ) )
{
throw new ArchetypeNotConfigured( "The archetype is not configured" );
}
Context context = prepareVelocityContext( request );
-
+
String packageName = request.getPackage();
String artifactId = request.getArtifactId();
File outputDirectoryFile = new File( basedir, artifactId );
@@ -365,7 +362,7 @@
context.put(Constants.ARTIFACT_ID, request.getArtifactId());
context.put(Constants.VERSION, request.getVersion());
context.put(Constants.PACKAGE, request.getPackage());
-
+
Iterator iterator = request.getProperties().keySet().iterator();
while ( iterator.hasNext() )
{
@@ -670,12 +667,9 @@
true
);
- /*if ( StringUtils.isEmpty ( moduleOffset ) )
- {*/
getLogger().debug( "Adding module " + moduleId );
pomManager.addModule( basedirPom, moduleId );
pomManager.addParent( pom, basedirPom );
- //}
}
private void processTemplate(
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java Mon Nov 26 10:52:51 2007
@@ -116,7 +116,7 @@
// ----------------------------------------------------------------------
File archetype;
-
+
try
{
archetype = downloader.download( archetypeGroupId, archetypeArtifactId, archetypeVersion, archetypeRepository, localRepository,
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java Mon Nov 26 10:52:51 2007
@@ -20,6 +20,7 @@
package org.apache.maven.archetype.source;
import org.apache.maven.archetype.catalog.Archetype;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.settings.Settings;
import java.util.List;
@@ -38,11 +39,14 @@
{
String ROLE = ArchetypeDataSource.class.getName();
- List getArchetypes( Properties properties )
+// List getArchetypes( Properties properties )
+// throws ArchetypeDataSourceException;
+
+ ArchetypeCatalog getArchetypeCatalog( Properties properties )
throws ArchetypeDataSourceException;
void updateCatalog( Properties properties, Archetype archetype, Settings settings )
throws ArchetypeDataSourceException;
- ArchetypeDataSourceDescriptor getDescriptor();
+// ArchetypeDataSourceDescriptor getDescriptor();
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSink.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSink.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSink.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSink.java Mon Nov 26 10:52:51 2007
@@ -51,7 +51,7 @@
Writer writer )
throws ArchetypeDataSourceException, ArchetypeDataSinkException
{
- List archetypes = source.getArchetypes( properties );
+ List archetypes = source.getArchetypeCatalog( properties ).getArchetypes();
putArchetypes( archetypes, writer );
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java Mon Nov 26 10:52:51 2007
@@ -209,13 +209,47 @@
}
}
- public ArchetypeDataSourceDescriptor getDescriptor()
+ public ArchetypeCatalog getArchetypeCatalog( Properties properties )
+ throws ArchetypeDataSourceException
{
- ArchetypeDataSourceDescriptor d = new ArchetypeDataSourceDescriptor();
+ String s = properties.getProperty( ARCHETYPE_CATALOG_PROPERTY );
- d.addParameter( ARCHETYPE_CATALOG_PROPERTY, String.class, DEFAULT_ARCHETYPE_CATALOG.getAbsolutePath(),
- "The repository URL where the archetype catalog resides." );
+ s = StringUtils.replace( s, "${user.home}", System.getProperty( "user.home" ) );
- return d;
+ File catalogFile = new File( s );
+ if ( catalogFile.exists() && catalogFile.isDirectory() )
+ {
+ catalogFile = new File( catalogFile, ARCHETYPE_CATALOG_FILENAME );
+ }
+ getLogger().debug( "Using catalog " + catalogFile );
+
+ if ( catalogFile.exists() )
+ {
+
+ try
+ {
+ return readCatalog( new FileReader( catalogFile ) );
+
+ }
+ catch ( FileNotFoundException e )
+ {
+ throw new ArchetypeDataSourceException( "The specific archetype catalog does not exist.",
+ e );
+ }
+ }
+ else
+ {
+ return new ArchetypeCatalog();
+ }
}
+
+// public ArchetypeDataSourceDescriptor getDescriptor()
+// {
+// ArchetypeDataSourceDescriptor d = new ArchetypeDataSourceDescriptor();
+//
+// d.addParameter( ARCHETYPE_CATALOG_PROPERTY, String.class, DEFAULT_ARCHETYPE_CATALOG.getAbsolutePath(),
+// "The repository URL where the archetype catalog resides." );
+//
+// return d;
+// }
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java Mon Nov 26 10:52:51 2007
@@ -20,6 +20,7 @@
package org.apache.maven.archetype.source;
import org.apache.maven.archetype.catalog.Archetype;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.settings.Settings;
import java.io.IOException;
@@ -36,20 +37,30 @@
public class InternalCatalogArchetypeDataSource
extends CatalogArchetypeDataSource
{
- public List getArchetypes( Properties properties )
+
+ public ArchetypeCatalog getArchetypeCatalog( Properties properties )
throws ArchetypeDataSourceException
{
Reader reader = new InputStreamReader(
getClass().getClassLoader().getResourceAsStream( "archetype-catalog.xml" ) );
- return createArchetypeMap( readCatalog( reader ) );
+ return readCatalog( reader );
}
- public void updateCatalog( Properties properties,
- Archetype archetype,
- Settings settings )
+ public List getArchetypes( Properties properties )
throws ArchetypeDataSourceException
{
- throw new ArchetypeDataSourceException( "Not supported yet." );
+ Reader reader = new InputStreamReader(
+ getClass().getClassLoader().getResourceAsStream( "archetype-catalog.xml" ) );
+
+ return createArchetypeMap( readCatalog( reader ) );
}
+
+// public void updateCatalog( Properties properties,
+// Archetype archetype,
+// Settings settings )
+// throws ArchetypeDataSourceException
+// {
+// throw new ArchetypeDataSourceException( "Not supported yet." );
+// }
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java Mon Nov 26 10:52:51 2007
@@ -29,6 +29,8 @@
import java.io.FileReader;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
/**
* @plexus.component role-hint="remote-catalog"
@@ -42,16 +44,56 @@
public static String REPOSITORY_PROPERTY = "repository";
+ public ArchetypeCatalog getArchetypeCatalog( Properties properties )
+ throws ArchetypeDataSourceException
+ {
+ String repository = properties.getProperty( REPOSITORY_PROPERTY );
+
+ if ( repository == null )
+ {
+ throw new ArchetypeDataSourceException( "To use the remote catalog you must specify the 'repository' property with an URL." );
+ }
+
+ try
+ {
+ if ( repository.endsWith( "/" ) )
+ {
+ repository = repository.substring( 0, repository.length( ) - 1 );
+ }
+
+ // We use wagon to take advantage of a Proxy that has already been setup in a Maven environment.
+
+ Repository wagonRepository = new Repository( "archetype", repository );
+
+ Wagon wagon = wagonManager.getWagon( wagonRepository );
+
+ File catalog = File.createTempFile( "archetype-catalog", ".xml" );
+
+ wagon.connect( wagonRepository );
+
+ wagon.get( "archetype-catalog.xml", catalog );
+
+ wagon.disconnect();
+
+ return readCatalog( new FileReader( catalog ) );
+ }
+ catch ( Exception e )
+ {
+ getLogger().warn( "Error reading archetype catalog "+ repository, e );
+ return new ArchetypeCatalog();
+ }
+ }
+
public List getArchetypes( Properties properties )
throws ArchetypeDataSourceException
{
String repository = properties.getProperty( REPOSITORY_PROPERTY );
-
+
if ( repository == null )
{
throw new ArchetypeDataSourceException( "To use the remote catalog you must specify the 'remote-catalog.repository' property correctly in your ~/.m2/archetype-catalog.properties file." );
}
-
+
try
{
if ( repository.endsWith( "/" ) )
@@ -85,14 +127,5 @@
throws ArchetypeDataSourceException
{
throw new ArchetypeDataSourceException( "Not supported yet." );
- }
-
- public ArchetypeDataSourceDescriptor getDescriptor()
- {
- ArchetypeDataSourceDescriptor d = new ArchetypeDataSourceDescriptor();
-
- d.addParameter( REPOSITORY_PROPERTY, String.class, "http://repo1.maven.org/maven2", "The repository URL where the archetype catalog resides." );
-
- return d;
}
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-common.mdo
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-common.mdo?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-common.mdo (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-common.mdo Mon Nov 26 10:52:51 2007
@@ -30,7 +30,7 @@
<classes>
- <class rootElement="true">
+ <!--class>
<name>Archetype</name>
<fields>
<field>
@@ -101,9 +101,9 @@
]]></code>
</codeSegment>
</codeSegments>
- </class>
+ </class-->
- <class>
+ <class rootElement="true">
<name>ArchetypeDefinition</name>
<fields>
<field>
Added: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java?rev=598380&view=auto
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java (added)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java Mon Nov 26 10:52:51 2007
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2007 rafale.
+ *
+ * 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.
+ * under the License.
+ */
+package org.apache.maven.archetype;
+
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URL;
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
+import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
+import org.codehaus.cargo.container.deployable.DeployableType;
+import org.codehaus.cargo.container.deployable.WAR;
+import org.codehaus.cargo.container.deployer.Deployer;
+import org.codehaus.cargo.container.deployer.URLDeployableMonitor;
+import org.codehaus.cargo.container.jetty.Jetty6xEmbeddedLocalContainer;
+import org.codehaus.cargo.container.jetty.Jetty6xEmbeddedLocalDeployer;
+import org.codehaus.cargo.container.jetty.Jetty6xEmbeddedStandaloneLocalConfiguration;
+import org.codehaus.cargo.container.property.ServletPropertySet;
+import org.codehaus.cargo.generic.deployable.DefaultDeployableFactory;
+import org.codehaus.cargo.generic.deployable.DeployableFactory;
+import org.codehaus.plexus.PlexusTestCase;
+
+/**
+ *
+ * @author rafale
+ */
+public class ArchetypeCatalogsTest
+ extends PlexusTestCase
+{
+ public void testRemoteCatalog()
+ throws Exception
+ {
+
+ Archetype archetype = (Archetype) lookup( Archetype.class );
+
+ ArchetypeCatalog result = archetype.getRemoteCatalog( "http://localhost:18881/repo/" );
+
+ assertEquals( 1, result.getArchetypes().size() );
+ assertEquals( "groupId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getGroupId() );
+ assertEquals( "artifactId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getArtifactId() );
+ assertEquals( "1", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getVersion() );
+ assertEquals( "http://localhost:18881/repo/", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getRepository() );
+ }
+
+ public void testLocalCatalog()
+ throws Exception
+ {
+
+ Archetype archetype = (Archetype) lookup( Archetype.class );
+
+ ArchetypeCatalog result = archetype.getLocalCatalog( getTestFile( "target/test-classes/repositories/test-catalog" ).
+ getAbsolutePath() );
+
+ assertEquals( 1, result.getArchetypes().size() );
+ assertEquals( "groupId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getGroupId() );
+ assertEquals( "artifactId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getArtifactId() );
+ assertEquals( "1", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getVersion() );
+ assertEquals( "http://localhost:18881/repo/", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
+ get( 0 )).getRepository() );
+ }
+
+ private Jetty6xEmbeddedLocalContainer cargo;
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ // Start Cargo
+
+ File catalogDirectory = getTestFile( "target/test-classes/repositories/test-catalog" );
+ catalogDirectory.mkdirs();
+
+ getTestFile( "target/test-classes/repositories/test-catalog/dummy" ).createNewFile();
+
+ ArchetypeCatalog catalog = new ArchetypeCatalog();
+ org.apache.maven.archetype.catalog.Archetype generatedArchetype = new org.apache.maven.archetype.catalog.Archetype();
+ generatedArchetype.setGroupId( "groupId" );
+ generatedArchetype.setArtifactId( "artifactId" );
+ generatedArchetype.setVersion( "1" );
+ generatedArchetype.setRepository( "http://localhost:18881/repo/" );
+ catalog.addArchetype( generatedArchetype );
+
+ File catalogFile = new File( catalogDirectory, "archetype-catalog.xml" );
+ ArchetypeCatalogXpp3Writer catalogWriter = new ArchetypeCatalogXpp3Writer();
+ Writer writer = new FileWriter( catalogFile );
+ catalogWriter.write( writer, catalog );
+ IOUtils.closeQuietly( writer );
+
+
+ Jetty6xEmbeddedStandaloneLocalConfiguration configuration =
+ new Jetty6xEmbeddedStandaloneLocalConfiguration( "target/repository-webapp" );
+ configuration.setProperty( ServletPropertySet.PORT, "18881" );
+
+ System.setProperty( "org.apache.maven.archetype.reporitory.directory",
+ getTestPath( "target/test-classes/repositories/test-catalog" ) );
+ cargo = new Jetty6xEmbeddedLocalContainer( configuration );
+ cargo.setTimeout( 180000L );
+ cargo.start();
+
+ DeployableFactory factory = new DefaultDeployableFactory();
+ WAR war = (WAR) factory.createDeployable( cargo.getId(),
+ "target/wars/archetype-repository.war",
+ DeployableType.WAR );
+
+ war.setContext( "/repo" );
+
+ Deployer deployer = new Jetty6xEmbeddedLocalDeployer( cargo );
+ deployer.deploy( war,
+ new URLDeployableMonitor( new URL( "http://localhost:18881/repo/dummy" ) ) );
+ deployer.start( war );
+ }
+
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+ // Stop Cargo
+
+ cargo.stop();
+ }
+}
Propchange: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java Mon Nov 26 10:52:51 2007
@@ -50,7 +50,6 @@
extends AbstractMojoTestCase
{
ArtifactRepository localRepository;
- //List repositories;
public void testArchetypeNotDefined()
throws
@@ -1013,8 +1012,6 @@
{
assertNotNull( instance );
assertNotNull( getVariableValueFromObject( instance, "archetypeArtifactManager" ) );
-// assertNotNull( getVariableValueFromObject( instance, "archetypeFactory" ) );
-// assertNotNull( getVariableValueFromObject( instance, "archetypePropertiesManager" ) );
assertNotNull( getVariableValueFromObject( instance, "oldArchetype" ) );
assertNotNull( getVariableValueFromObject( instance, "filesetGenerator" ) );
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java Mon Nov 26 10:52:51 2007
@@ -5,6 +5,7 @@
import java.io.File;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.archetype.Archetype;
/** @author Jason van Zyl */
public class WikiArchetypeDataSourceTest
@@ -14,10 +15,13 @@
throws Exception
{
Properties p = new Properties();
-
ArchetypeDataSource ads = new InternalCatalogArchetypeDataSource();
+ List archetypes = ads.getArchetypeCatalog( p ).getArchetypes();
+
+ assertEquals( 37, archetypes.size() );
- List archetypes = ads.getArchetypes( p );
+ Archetype a = (Archetype) lookup(Archetype.class);
+ archetypes=a.getInternalCatalog().getArchetypes();
assertEquals( 37, archetypes.size() );
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java Mon Nov 26 10:52:51 2007
@@ -29,6 +29,7 @@
import java.io.File;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -50,21 +51,16 @@
new File( getBasedir(), "target/test-classes/repositories/local" )
.toURI().toURL().toExternalForm(), "local-repo" );
- Properties catalogProperties = new Properties();
+ ArchetypeCatalog catalog = archetype.getLocalCatalog(
+ new File( getBasedir(), "target/test-classes/repositories/central" ).getAbsolutePath()
+ );
- catalogProperties.setProperty( "sources", "remote-catalog" );
-
- catalogProperties.setProperty( "remote-catalog.repository",
- new File( getBasedir(), "target/test-classes/repositories/central" )
- .toURI().toURL().toExternalForm() );
-
- List archetypes = archetype.getAvailableArchetypes( catalogProperties );
-
- System.err.println( "archetypes => " + archetypes );
+ System.err.println( "archetypes => " + catalog.getArchetypes() );
// Here I am just grabbing a OldArchetype but in a UI you would take the OldArchetype objects and present
// them to the user.
- org.apache.maven.archetype.catalog.Archetype selection = (org.apache.maven.archetype.catalog.Archetype) archetypes.get( archetypes.size() - 1 );
+ org.apache.maven.archetype.catalog.Archetype selection = (org.apache.maven.archetype.catalog.Archetype)
+ catalog.getArchetypes().get( catalog.getArchetypes().size() - 1 );
System.err.println( "Selected OldArchetype = " + selection );
// Now you will present a dialog, or whatever, and grab the following values.
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java Mon Nov 26 10:52:51 2007
@@ -57,7 +57,7 @@
public class ArchetyperRoundtripTest
extends PlexusTestCase
{
- Jetty6xEmbeddedLocalContainer container;
+ private Jetty6xEmbeddedLocalContainer container;
public void testArchetyper()
throws Exception
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeSelectionQueryer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeSelectionQueryer.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeSelectionQueryer.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeSelectionQueryer.java Mon Nov 26 10:52:51 2007
@@ -19,7 +19,7 @@
package org.apache.maven.archetype.ui;
-import org.apache.maven.archetype.common.Archetype;
+//import org.apache.maven.archetype.common.Archetype;
import org.apache.maven.archetype.common.ArchetypeDefinition;
import org.codehaus.plexus.components.interactivity.PrompterException;
@@ -37,15 +37,15 @@
throws
PrompterException;
- Archetype selectArtifact( List list )
- throws
- PrompterException;
-
- String selectGroup( List list )
- throws
- PrompterException;
-
- String selectVersion( List list )
- throws
- PrompterException;
+// Archetype selectArtifact( List list )
+// throws
+// PrompterException;
+//
+// String selectGroup( List list )
+// throws
+// PrompterException;
+//
+// String selectVersion( List list )
+// throws
+// PrompterException;
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java?rev=598380&r1=598379&r2=598380&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java Mon Nov 26 10:52:51 2007
@@ -19,7 +19,7 @@
package org.apache.maven.archetype.ui;
-import org.apache.maven.archetype.common.Archetype;
+//import org.apache.maven.archetype.common.Archetype;
import org.apache.maven.archetype.common.ArchetypeDefinition;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
@@ -81,85 +81,85 @@
return (org.apache.maven.archetype.catalog.Archetype) answerMap.get( answer );
}
-
- public String selectGroup( List groups )
- throws
- PrompterException
- {
- String query = "Choose group:\n";
- Map answerMap = new HashMap();
- List answers = new ArrayList();
- Iterator groupIterator = groups.iterator();
- int counter = 1;
- while ( groupIterator.hasNext() )
- {
- String group = (String) groupIterator.next();
-
- answerMap.put( "" + counter, group );
- query += "" + counter + ": " + group + "\n";
- answers.add( "" + counter );
-
- counter++;
- }
- query += "Choose a number: ";
-
- String answer = prompter.prompt( query, answers );
-
- return (String) answerMap.get( answer );
- }
-
- public Archetype selectArtifact( List archetypes )
- throws
- PrompterException
- {
- String query = "Choose archetype:\n";
- Map answerMap = new HashMap();
- List answers = new ArrayList();
- Iterator archetypeIterator = archetypes.iterator();
- int counter = 1;
- while ( archetypeIterator.hasNext() )
- {
- Archetype archetype = (Archetype) archetypeIterator.next();
-
- answerMap.put( "" + counter, archetype );
- query +=
- "" + counter + ": " + archetype.getName() + " (" + archetype.getGroupId() + ":"
- + archetype.getArtifactId() + ")\n";
- answers.add( "" + counter );
-
- counter++;
- }
- query += "Choose a number: ";
-
- String answer = prompter.prompt( query, answers );
-
- return (Archetype) answerMap.get( answer );
- }
-
- public String selectVersion( List archetypeVersions )
- throws
- PrompterException
- {
- String query = "Choose version: \n";
- Map answerMap = new HashMap();
- List answers = new ArrayList();
-
- Iterator archetypeVersionsKeys = archetypeVersions.iterator();
- int counter = 1;
- while ( archetypeVersionsKeys.hasNext() )
- {
- String archetypeVersion = (String) archetypeVersionsKeys.next();
-
- answerMap.put( "" + counter, archetypeVersion );
- query += "" + counter + ": " + archetypeVersion + "\n";
- answers.add( "" + counter );
-
- counter++;
- }
- query += "Choose a number: ";
-
- String answer = prompter.prompt( query, answers );
-
- return (String) answerMap.get( answer );
- }
+//
+// public String selectGroup( List groups )
+// throws
+// PrompterException
+// {
+// String query = "Choose group:\n";
+// Map answerMap = new HashMap();
+// List answers = new ArrayList();
+// Iterator groupIterator = groups.iterator();
+// int counter = 1;
+// while ( groupIterator.hasNext() )
+// {
+// String group = (String) groupIterator.next();
+//
+// answerMap.put( "" + counter, group );
+// query += "" + counter + ": " + group + "\n";
+// answers.add( "" + counter );
+//
+// counter++;
+// }
+// query += "Choose a number: ";
+//
+// String answer = prompter.prompt( query, answers );
+//
+// return (String) answerMap.get( answer );
+// }
+//
+// public Archetype selectArtifact( List archetypes )
+// throws
+// PrompterException
+// {
+// String query = "Choose archetype:\n";
+// Map answerMap = new HashMap();
+// List answers = new ArrayList();
+// Iterator archetypeIterator = archetypes.iterator();
+// int counter = 1;
+// while ( archetypeIterator.hasNext() )
+// {
+// Archetype archetype = (Archetype) archetypeIterator.next();
+//
+// answerMap.put( "" + counter, archetype );
+// query +=
+// "" + counter + ": " + archetype.getName() + " (" + archetype.getGroupId() + ":"
+// + archetype.getArtifactId() + ")\n";
+// answers.add( "" + counter );
+//
+// counter++;
+// }
+// query += "Choose a number: ";
+//
+// String answer = prompter.prompt( query, answers );
+//
+// return (Archetype) answerMap.get( answer );
+// }
+//
+// public String selectVersion( List archetypeVersions )
+// throws
+// PrompterException
+// {
+// String query = "Choose version: \n";
+// Map answerMap = new HashMap();
+// List answers = new ArrayList();
+//
+// Iterator archetypeVersionsKeys = archetypeVersions.iterator();
+// int counter = 1;
+// while ( archetypeVersionsKeys.hasNext() )
+// {
+// String archetypeVersion = (String) archetypeVersionsKeys.next();
+//
+// answerMap.put( "" + counter, archetypeVersion );
+// query += "" + counter + ": " + archetypeVersion + "\n";
+// answers.add( "" + counter );
+//
+// counter++;
+// }
+// query += "Choose a number: ";
+//
+// String answer = prompter.prompt( query, answers );
+//
+// return (String) answerMap.get( answer );
+// }
}