You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/07/12 19:08:06 UTC
svn commit: r555722 [3/4] - in /incubator/nmaven/branches/SI_GAC: ./
archetypes/ archetypes/maven-archetype-dotnet-simple/
archetypes/maven-archetype-netexecutable/ assemblies/
assemblies/NMaven.Artifact/
assemblies/NMaven.Artifact/src/main/csharp/NMav...
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,168 @@
+package org.apache.maven.dotnet.dao.impl;
+
+import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.manager.WagonConfigurationException;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.UnsupportedProtocolException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.wagon.repository.Repository;
+import org.apache.maven.wagon.repository.RepositoryPermissions;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.PlexusContainer;
+
+import java.util.List;
+import java.util.Collection;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class WagonManagerTestStub
+ implements WagonManager
+{
+
+ private File basedir;
+
+ public Wagon getWagon( String string )
+ throws UnsupportedProtocolException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Wagon getWagon( Repository repository )
+ throws UnsupportedProtocolException, WagonConfigurationException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void getArtifact( Artifact artifact, List list )
+ throws TransferFailedException, ResourceDoesNotExistException
+ {
+ if ( artifact.getType().equals( "pom" ) )
+ {
+ File pomFile = artifact.getFile();
+ try
+ {
+ FileOutputStream fos = new FileOutputStream( pomFile );
+ FileInputStream fis = new FileInputStream( new File( basedir, "target/test-classes/" +
+ artifact.getGroupId() + "-" + artifact.getArtifactId() + "-" + artifact.getVersion() + ".xml" ) );
+ IOUtil.copy( fis, fos );
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void getArtifact( Artifact artifact, ArtifactRepository artifactRepository )
+ throws TransferFailedException, ResourceDoesNotExistException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void putArtifact( File file, Artifact artifact, ArtifactRepository artifactRepository )
+ throws TransferFailedException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void putArtifactMetadata( File file, ArtifactMetadata artifactMetadata,
+ ArtifactRepository artifactRepository )
+ throws TransferFailedException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void getArtifactMetadata( ArtifactMetadata artifactMetadata, ArtifactRepository artifactRepository,
+ File file, String string )
+ throws TransferFailedException, ResourceDoesNotExistException
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setOnline( boolean b )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public boolean isOnline()
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addProxy( String string, String string1, int i, String string2, String string3, String string4 )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addAuthenticationInfo( String string, String string1, String string2, String string3, String string4 )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addMirror( String string, String string1, String string2 )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setDownloadMonitor( TransferListener transferListener )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addPermissionInfo( String string, String string1, String string2 )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public ProxyInfo getProxy( String string )
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public AuthenticationInfo getAuthenticationInfo( String string )
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void addConfiguration( String string, Xpp3Dom xpp3Dom )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setInteractive( boolean b )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void registerWagons( Collection collection, PlexusContainer plexusContainer )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void findAndRegisterWagons( PlexusContainer plexusContainer )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setDefaultRepositoryPermissions( RepositoryPermissions repositoryPermissions )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ protected void setBaseDir( File basedir )
+ {
+ this.basedir = basedir;
+ }
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test-1.0.0.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test-1.0.0.xml?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test-1.0.0.xml (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test-1.0.0.xml Thu Jul 12 12:07:57 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven</groupId>
+ <artifactId>NMaven.Test</artifactId>
+ <version>1.0.0</version>
+ <name>NMaven.Test</name>
+ <description>
+ </description>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test-1.0.0.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test2-1.0.0.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test2-1.0.0.xml?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test2-1.0.0.xml (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test2-1.0.0.xml Thu Jul 12 12:07:57 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven</groupId>
+ <artifactId>NMaven.Test2</artifactId>
+ <version>1.0.0</version>
+ <name>NMaven.Test</name>
+ <description>
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>NMaven</groupId>
+ <artifactId>NMaven.Test4</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test2-1.0.0.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test3-1.0.0.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test3-1.0.0.xml?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test3-1.0.0.xml (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test3-1.0.0.xml Thu Jul 12 12:07:57 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven</groupId>
+ <artifactId>NMaven.Test3</artifactId>
+ <version>1.0.0</version>
+ <name>NMaven.Test</name>
+ <description>
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>NMaven</groupId>
+ <artifactId>NMaven.Test4</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test3-1.0.0.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test4-1.0.0.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test4-1.0.0.xml?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test4-1.0.0.xml (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test4-1.0.0.xml Thu Jul 12 12:07:57 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven</groupId>
+ <artifactId>NMaven.Test4</artifactId>
+ <version>1.0.0</version>
+ <name>NMaven.Test</name>
+ <description>
+ </description>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test4-1.0.0.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/pom.xml?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/pom.xml (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/pom.xml Thu Jul 12 12:07:57 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven.Test2</groupId>
+ <artifactId>NMaven.Test2.Test1</artifactId>
+ <version>1.0.0</version>
+ <name>NMaven.Test2.Test1</name>
+ <description>
+ </description>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/README.txt?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/README.txt (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/README.txt Thu Jul 12 12:07:57 2007
@@ -1,6 +1,6 @@
Axis Plugin for Maven (Java2Wsdl) does not work, so here the manual steps to generate a WSDL:
1) Install Axis2
2) mvn install from the dotnet-embedder directory
-3) java2wsdl -cn org.apache.maven.dotnet.embedder.MavenEmbedderService -cp target/dotnet-embedder-0.14-SNAPSHOT.jar -o src/main/resources
+3) java2wsdl -cn org.apache.maven.dotnet.embedder.MavenEmbedderService -cp target/dotnet-embedder-0.14.jar -o src/main/resources
wsdl2java -o . -uri src\main\resources\MavenEmbedder.wsdl -s -S src\main\java -ss -sd
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/build.bat
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/build.bat?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/build.bat (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/build.bat Thu Jul 12 12:07:57 2007
@@ -1,2 +1,2 @@
call mvn install
-call java2wsdl -cn org.apache.maven.dotnet.embedder.ITest -cp target/dotnet-embedder-0.14-SNAPSHOT.jar -o src/main/resources
\ No newline at end of file
+call java2wsdl -cn org.apache.maven.dotnet.embedder.ITest -cp target/dotnet-embedder-0.14.jar -o src/main/resources
\ No newline at end of file
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-embedder/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-executable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-executable/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-executable/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-executable/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java Thu Jul 12 12:07:57 2007
@@ -65,7 +65,7 @@
commands.add( "/out:" + artifactFilePath );
commands.add( "/target:" + targetArtifactType );
commands.add( "/recurse:" + sourceDirectory + File.separator + "**" );
- if ( !modules.isEmpty() )
+ if ( modules != null && !modules.isEmpty() )
{
StringBuffer sb = new StringBuffer();
for ( Iterator i = modules.iterator(); i.hasNext(); )
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java Thu Jul 12 12:07:57 2007
@@ -134,7 +134,7 @@
catch ( ArtifactException e )
{
logger.error( "NMAVEN-061-000: Improper Initialization of the Net Modules", e );
- return null;
+ return new ArrayList<Artifact>();
//TODO: How to handle this: usually implies improper init of ArtifactContext
}
if ( config.isTestCompile() && config.getArtifactType().equals( ArtifactType.MODULE ) )
@@ -301,62 +301,65 @@
artifactContext.init( project, project.getRemoteArtifactRepositories(), config.getLocalRepository() );
Set<Artifact> artifacts = project.getDependencyArtifacts();//Can add WFC deps prior
- for ( Artifact artifact : artifacts )
+ if ( artifacts != null )
{
- String type = artifact.getType();
- if ( type.equals( "module" ) )
+ for ( Artifact artifact : artifacts )
{
- modules.add( artifact );
- }
- else if ( type.equals( "library" ) || type.equals( "exe" ) )
- {
- libraries.add( artifact );
- }
- //Resolving here since the GAC path is vendor and framework aware
- else if ( type.equals( "gac_generic" ) )
- {
- String gacRoot = null;
- if ( compilerRequirement.getVendor().equals( Vendor.MICROSOFT ) && (
- compilerRequirement.getFrameworkVersion().equals( "2.0.50727" ) ||
- compilerRequirement.getFrameworkVersion().equals( "3.0" ) ) )
+ String type = artifact.getType();
+ if ( type.equals( "module" ) )
{
- gacRoot = System.getenv( "SystemRoot" ) + "\\assembly\\GAC_MSIL\\";
+ modules.add( artifact );
}
- else if ( compilerRequirement.getVendor().equals( Vendor.MICROSOFT ) &&
- compilerRequirement.getFrameworkVersion().equals( "1.1.4322" ) )
+ else if ( type.equals( "library" ) || type.equals( "exe" ) )
{
- gacRoot = System.getenv( "SystemRoot" ) + "\\assembly\\GAC\\";
+ libraries.add( artifact );
}
- else if ( compilerRequirement.getVendor().equals( Vendor.MONO ) )
+ //Resolving here since the GAC path is vendor and framework aware
+ else if ( type.equals( "gac_generic" ) )
{
- gacRoot = getGacRootForMono();
+ String gacRoot = null;
+ if ( compilerRequirement.getVendor().equals( Vendor.MICROSOFT ) && (
+ compilerRequirement.getFrameworkVersion().equals( "2.0.50727" ) ||
+ compilerRequirement.getFrameworkVersion().equals( "3.0" ) ) )
+ {
+ gacRoot = System.getenv( "SystemRoot" ) + "\\assembly\\GAC_MSIL\\";
+ }
+ else if ( compilerRequirement.getVendor().equals( Vendor.MICROSOFT ) &&
+ compilerRequirement.getFrameworkVersion().equals( "1.1.4322" ) )
+ {
+ gacRoot = System.getenv( "SystemRoot" ) + "\\assembly\\GAC\\";
+ }
+ else if ( compilerRequirement.getVendor().equals( Vendor.MONO ) )
+ {
+ gacRoot = getGacRootForMono();
+ }
+ if ( gacRoot != null )
+ {
+ setArtifactGacFile( gacRoot, artifact );
+ libraries.add( artifact );
+ }
}
- if ( gacRoot != null )
+ else if ( type.equals( "gac" ) )
{
+ String gacRoot = ( compilerRequirement.getVendor().equals( Vendor.MONO ) ) ? getGacRootForMono()
+ : System.getenv( "SystemRoot" ) + "\\assembly\\GAC\\";
+ setArtifactGacFile( gacRoot, artifact );
+ libraries.add( artifact );
+ }
+ else if ( type.equals( "gac_32" ) )
+ {
+ String gacRoot = ( compilerRequirement.getVendor().equals( Vendor.MONO ) ) ? getGacRootForMono()
+ : System.getenv( "SystemRoot" ) + "\\assembly\\GAC_32\\";
+ setArtifactGacFile( gacRoot, artifact );
+ libraries.add( artifact );
+ }
+ else if ( type.equals( "gac_msil" ) )
+ {
+ String gacRoot = ( compilerRequirement.getVendor().equals( Vendor.MONO ) ) ? getGacRootForMono()
+ : System.getenv( "SystemRoot" ) + "\\assembly\\GAC_MSIL\\";
setArtifactGacFile( gacRoot, artifact );
libraries.add( artifact );
}
- }
- else if ( type.equals( "gac" ) )
- {
- String gacRoot = ( compilerRequirement.getVendor().equals( Vendor.MONO ) ) ? getGacRootForMono()
- : System.getenv( "SystemRoot" ) + "\\assembly\\GAC\\";
- setArtifactGacFile( gacRoot, artifact );
- libraries.add( artifact );
- }
- else if ( type.equals( "gac_32" ) )
- {
- String gacRoot = ( compilerRequirement.getVendor().equals( Vendor.MONO ) ) ? getGacRootForMono()
- : System.getenv( "SystemRoot" ) + "\\assembly\\GAC_32\\";
- setArtifactGacFile( gacRoot, artifact );
- libraries.add( artifact );
- }
- else if ( type.equals( "gac_msil" ) )
- {
- String gacRoot = ( compilerRequirement.getVendor().equals( Vendor.MONO ) ) ? getGacRootForMono()
- : System.getenv( "SystemRoot" ) + "\\assembly\\GAC_MSIL\\";
- setArtifactGacFile( gacRoot, artifact );
- libraries.add( artifact );
}
}
@@ -414,8 +417,8 @@
private void setArtifactGacFile( String gacRoot, Artifact artifact )
throws PlatformUnsupportedException
{
- File gacFile = new File( gacRoot, artifact.getArtifactId() + File.separator + artifact.getVersion() + File
- .separator + artifact.getArtifactId() + ".dll" );
+ File gacFile = new File( gacRoot, artifact.getArtifactId() + File.separator + artifact.getVersion() + "__" +
+ artifact.getClassifier() + File.separator + artifact.getArtifactId() + ".dll" );
if ( !gacFile.exists() )
{
throw new PlatformUnsupportedException(
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-jetty/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-jetty/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-jetty/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/assembly-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/assembly-plugins/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/assembly-plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/assembly-plugins/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/compiler-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/compiler-plugins/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/compiler-plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/compiler-plugins/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/configuration-appenders/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/configuration-appenders/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/configuration-appenders/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/configuration-appenders/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/entries/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/entries/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/entries/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/entries/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/executable-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/executable-plugins/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/executable-plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/executable-plugins/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/netdependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/netdependency/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/netdependency/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/netdependency/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-model/settings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-model/settings/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-model/settings/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-model/settings/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-model</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,6 +40,21 @@
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf</groupId>
+ <artifactId>openrdf-repository-api</artifactId>
+ <version>2.0-beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf</groupId>
+ <artifactId>openrdf-repository-sail</artifactId>
+ <version>2.0-beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf</groupId>
+ <artifactId>openrdf-sail-memory</artifactId>
+ <version>2.0-beta4</version>
</dependency>
</dependencies>
<build>
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/ConnectionsRepository.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/ConnectionsRepository.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/ConnectionsRepository.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/ConnectionsRepository.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,98 @@
+package org.apache.maven.dotnet.registry;
+
+import org.openrdf.repository.RepositoryException;
+import org.openrdf.repository.sail.SailRepository;
+import org.openrdf.sail.memory.MemoryStore;
+import org.openrdf.sail.memory.MemoryStoreRDFSInferencer;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import java.util.logging.Logger;
+
+public class ConnectionsRepository
+ implements Repository
+{
+
+ private static Logger logger = Logger.getAnonymousLogger();
+
+ private RepositoryRegistry registry;
+
+ //Dangerous but performance is worth it
+ private static Set<DataAccessObject> daos = new HashSet<DataAccessObject>();
+
+ public void load( InputStream inputStream, Hashtable properties )
+ throws IOException
+ {
+ if ( daos.size() > 0 )
+ {
+ return;
+ }
+ long start = System.currentTimeMillis();
+
+ File dataDir = new File( "c:\\temp\\myRepository\\" );
+ MemoryStore store = new MemoryStore( dataDir );
+ store.setPersist( true );
+ store.setSyncDelay( 0 );
+ org.openrdf.repository.Repository rdfRepository = new SailRepository( new MemoryStoreRDFSInferencer( store ) );
+ try
+ {
+ rdfRepository.initialize();
+ }
+ catch ( RepositoryException e )
+ {
+ e.printStackTrace();
+ }
+
+ Set<String> keys = properties.keySet();
+ for ( String keyName : keys )
+ {
+ if ( keyName.trim().startsWith( "dao:" ) )
+ {
+ String daoClassName = (String) properties.get( keyName );
+ try
+ {
+ Class c = Class.forName( daoClassName );
+ Object o = c.getConstructor().newInstance();
+ if ( !( o instanceof DataAccessObject ) )
+ {
+ throw new IOException(
+ "JV-100-103: dao tag references a class that does not implement the DataAccessObject interface." );
+ }
+ DataAccessObject dao = (DataAccessObject) o;
+ dao.init( rdfRepository, keyName, daoClassName );
+ dao.setRepositoryRegistry( registry );
+ daos.add( dao );
+ logger.info( "JV-100-104: Adding data access object: Class Name = " + daoClassName );
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ throw new IOException(
+ "JV-100-105: Problem instantiating the DAO Class: Class Name = " + daoClassName );
+ }
+ catch ( Error e )
+ {
+ e.printStackTrace();
+ throw new IOException(
+ "JV-100-106: Problem instantiating the DAO Class: Class Name = " + daoClassName );
+ }
+ }
+ }
+ logger.info( "Connection Start Up: Time = " + ( System.currentTimeMillis() - start ) );
+ }
+
+ public void setRepositoryRegistry( RepositoryRegistry repositoryRegistry )
+ {
+ this.registry = repositoryRegistry;
+ }
+
+ public Set<DataAccessObject> getDataAccessObjects()
+ {
+ return Collections.unmodifiableSet( daos );
+ }
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/ConnectionsRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObject.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObject.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObject.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObject.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,22 @@
+package org.apache.maven.dotnet.registry;
+
+public interface DataAccessObject
+{
+ /**
+ * Class name accessor.
+ *
+ * @return class name of the DataAccessObject
+ */
+ String getClassName();
+
+ /**
+ * Accessor for ID
+ *
+ * @return id of the DataAccessObject
+ */
+ String getID();
+
+ void init(Object dataStoreObject, String id, String className ) throws IllegalArgumentException;
+
+ void setRepositoryRegistry(RepositoryRegistry repositoryRegistry);
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObjectRegistry.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObjectRegistry.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObjectRegistry.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObjectRegistry.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,34 @@
+package org.apache.maven.dotnet.registry;
+
+import java.util.Set;
+
+public interface DataAccessObjectRegistry
+{
+
+ /**
+ * Role used to register component implementations with the container.
+ */
+ String ROLE = DataAccessObjectRegistry.class.getName();
+
+ /**
+ * Returns all DataAccessObjects from the registry.
+ *
+ * @return a Set of all DataAccessObjects.
+ */
+ Set<DataAccessObject> findAll();
+
+ /**
+ * Finds a DataAccessObject from the registry.
+ *
+ * @param daoId the id of the DAO to find.
+ * @return a DataAccessObject or null if DAO cannot be found.
+ */
+ DataAccessObject find( String daoId );
+
+ /**
+ * Accessor for DAO ids
+ *
+ * @return unmodifiable set of DataAccessObject ids
+ */
+ Set<String> getDaoIds();
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObjectRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/RepositoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/RepositoryRegistry.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/RepositoryRegistry.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/RepositoryRegistry.java Thu Jul 12 12:07:57 2007
@@ -107,7 +107,7 @@
*
* @return unmodifiable set of repository names
*/
- Set getRepositoryNames();
+ Set<String> getRepositoryNames();
/**
* Empties all of the repositories from the registry.
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/DataAccessObjectRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/DataAccessObjectRegistryImpl.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/DataAccessObjectRegistryImpl.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/DataAccessObjectRegistryImpl.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,86 @@
+package org.apache.maven.dotnet.registry.impl;
+
+import org.apache.maven.dotnet.registry.RepositoryRegistry;
+import org.apache.maven.dotnet.registry.DataAccessObject;
+import org.apache.maven.dotnet.registry.Repository;
+import org.apache.maven.dotnet.registry.DataAccessObjectRegistry;
+import org.apache.maven.dotnet.registry.ConnectionsRepository;
+
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import java.util.logging.Logger;
+
+public class DataAccessObjectRegistryImpl implements DataAccessObjectRegistry
+{
+
+ private RepositoryRegistry repositoryRegistry;
+
+ private static Logger logger = Logger.getAnonymousLogger();
+
+ public Set<DataAccessObject> findAll()
+ {
+ Set<DataAccessObject> daos = new HashSet<DataAccessObject>();
+ if ( repositoryRegistry == null )
+ {
+ logger.warning( "Repository registry has not been set" );
+ return Collections.unmodifiableSet( daos );
+ }
+ for ( String name : repositoryRegistry.getRepositoryNames() )
+ {
+ Repository repository = repositoryRegistry.find( name );
+ if ( repository instanceof ConnectionsRepository )
+ {
+ daos.addAll( ( (ConnectionsRepository) repository ).getDataAccessObjects() );
+ }
+ }
+ return Collections.unmodifiableSet( daos );
+ }
+
+ public DataAccessObject find( String daoId )
+ {
+ if ( repositoryRegistry == null )
+ {
+ logger.warning( "Repository registry has not been set" );
+ return null;
+ }
+ for ( String name : repositoryRegistry.getRepositoryNames() )
+ {
+ Repository repository = repositoryRegistry.find( name );
+ if ( repository instanceof ConnectionsRepository )
+ {
+ for ( DataAccessObject dao : ( (ConnectionsRepository) repository ).getDataAccessObjects() )
+ {
+ if ( dao.getID().trim().equals( daoId ) )
+ {
+ return dao;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ public Set<String> getDaoIds()
+ {
+ Set<String> daoIds = new HashSet<String>();
+ if ( repositoryRegistry == null )
+ {
+ logger.warning( "Repository registry has not been set" );
+ return Collections.unmodifiableSet( daoIds );
+ }
+ for ( String name : repositoryRegistry.getRepositoryNames() )
+ {
+ Repository repository = repositoryRegistry.find( name );
+ if ( repository instanceof ConnectionsRepository )
+ {
+ for ( DataAccessObject dao : ( (ConnectionsRepository) repository ).getDataAccessObjects() )
+ {
+ daoIds.add( dao.getID() );
+ }
+ }
+ }
+ return Collections.unmodifiableSet( daoIds );
+ }
+
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/DataAccessObjectRegistryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/RepositoryRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/RepositoryRegistryImpl.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/RepositoryRegistryImpl.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/RepositoryRegistryImpl.java Thu Jul 12 12:07:57 2007
@@ -22,6 +22,7 @@
import org.apache.maven.dotnet.registry.RepositoryLoader;
import org.apache.maven.dotnet.registry.RegistryLoader;
import org.apache.maven.dotnet.registry.Repository;
+import org.apache.maven.dotnet.registry.DataAccessObjectRegistry;
import java.util.Hashtable;
import java.util.Properties;
@@ -46,6 +47,7 @@
private RepositoryLoader repositoryLoader;
private RegistryLoader registryLoader;
+
/**
* @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable#initialize()
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/resources/META-INF/plexus/components.xml Thu Jul 12 12:07:57 2007
@@ -1,8 +1,17 @@
<component-set>
- <components>
- <component>
- <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
- <implementation>org.apache.maven.dotnet.registry.impl.RepositoryRegistryImpl</implementation>
- </component>
- </components>
+ <components>
+ <component>
+ <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
+ <implementation>org.apache.maven.dotnet.registry.impl.RepositoryRegistryImpl</implementation>
+ </component>
+ <component>
+ <role>org.apache.maven.dotnet.registry.DataAccessObjectRegistry</role>
+ <implementation>org.apache.maven.dotnet.registry.impl.DataAccessObjectRegistryImpl</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
</component-set>
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-repository/pom.xml?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-repository/pom.xml (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-repository/pom.xml Thu Jul 12 12:07:57 2007
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <version>0.14</version>
+ <artifactId>dotnet-components</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-jdo</artifactId>
+ <name>dotnet-jdo</name>
+ <description>
+ </description>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Project.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Project.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Project.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Project.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,169 @@
+package org.apache.maven.dotnet.repository;
+
+import java.util.Set;
+import java.util.HashSet;
+
+public class Project
+{
+ private String groupId;
+
+ private String artifactId;
+
+ private String version;
+
+ private String publicKeyTokenId;
+
+ private boolean isResolved = false;
+
+ private String artifactType = "library";
+
+ private Set<ProjectDependency> projectDependencies = new HashSet<ProjectDependency>();
+
+ private Set<Requirement> requirements = new HashSet<Requirement>();
+
+ private Project parentProject;
+
+ public Project getParentProject()
+ {
+ return parentProject;
+ }
+
+ public void setParentProject( Project parentProject )
+ {
+ this.parentProject = parentProject;
+ }
+
+ public void addRequirement( Requirement requirement )
+ {
+ requirements.add( requirement );
+ }
+
+ public Set<Requirement> getRequirements()
+ {
+ return requirements;
+ }
+
+ public void setRequirements( Set<Requirement> requirements )
+ {
+ this.requirements = requirements;
+ }
+
+ public String getPublicKeyTokenId()
+ {
+ return publicKeyTokenId;
+ }
+
+ public void setPublicKeyTokenId( String publicKeyTokenId )
+ {
+ this.publicKeyTokenId = publicKeyTokenId;
+ }
+
+ public boolean isResolved()
+ {
+ return isResolved;
+ }
+
+ public void setResolved( boolean resolved )
+ {
+ isResolved = resolved;
+ }
+
+ public String getArtifactType()
+ {
+ return artifactType;
+ }
+
+ public void setArtifactType( String artifactType )
+ {
+ this.artifactType = artifactType;
+ }
+
+ public Set<ProjectDependency> getProjectDependencies()
+ {
+ return projectDependencies;
+ }
+
+ public void addProjectDependency( ProjectDependency projectDependency )
+ {
+ projectDependencies.add( projectDependency );
+ }
+
+ public void setProjectDependencies( Set<ProjectDependency> projectDependencies )
+ {
+ this.projectDependencies = projectDependencies;
+ }
+
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ public void setGroupId( String groupId )
+ {
+ this.groupId = groupId;
+ }
+
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ public void setArtifactId( String artifactId )
+ {
+ this.artifactId = artifactId;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion( String version )
+ {
+ this.version = version;
+ }
+
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+ if ( o == null || getClass() != o.getClass() )
+ {
+ return false;
+ }
+
+ final Project project = (Project) o;
+
+ if ( !artifactId.equals( project.artifactId ) )
+ {
+ return false;
+ }
+ if ( !groupId.equals( project.groupId ) )
+ {
+ return false;
+ }
+ if ( !version.equals( project.version ) )
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ public int hashCode()
+ {
+ //This problem cropping up during refactoring: Remove this check afterwards.
+ if(version == null)
+ {
+ System.out.println("Missing Version for: Group ID = " + groupId + ", Artifact ID = " + artifactId);
+ }
+
+ int result;
+ result = groupId.hashCode();
+ result = 29 * result + artifactId.hashCode();
+ result = 29 * result + version.hashCode();
+ return result;
+ }
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Project.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/ProjectDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/ProjectDependency.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/ProjectDependency.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/ProjectDependency.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,17 @@
+package org.apache.maven.dotnet.repository;
+
+public class ProjectDependency extends Project
+{
+ private String scope;
+
+ public String getScope()
+ {
+ return scope;
+ }
+
+ public void setScope( String scope )
+ {
+ this.scope = scope;
+ }
+
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/ProjectDependency.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Requirement.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Requirement.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Requirement.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Requirement.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,41 @@
+package org.apache.maven.dotnet.repository;
+
+import java.net.URI;
+
+public interface Requirement
+{
+ URI getUri();
+
+ String getValue();
+
+ public static class Factory
+ {
+ /**
+ * Default constructor
+ */
+ private Factory()
+ {
+ }
+
+ /**
+ * Creates a default implementation of Requirement
+ *
+ * @return a default implementation of vendor info
+ */
+ public static Requirement createDefaultRequirement( final URI uri, final String value )
+ {
+ return new Requirement()
+ {
+ public URI getUri()
+ {
+ return uri;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+ };
+ }
+ }
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Requirement.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/JdoTest.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/JdoTest.java?view=auto&rev=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/JdoTest.java (added)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/JdoTest.java Thu Jul 12 12:07:57 2007
@@ -0,0 +1,56 @@
+package org.apache.maven.dotnet.repository;
+
+/*
+import javax.repository.PersistenceManagerFactory;
+import javax.repository.JDOHelper;
+import javax.repository.PersistenceManager;
+import javax.repository.Transaction;
+import java.util.Set;
+import java.util.HashSet;
+*/
+
+public class JdoTest
+{
+ /*
+ PersistenceManager pm;
+
+ public void setUp()
+ {
+ PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( "jpox.properties" );
+ pm = pmf.getPersistenceManager();
+ }
+
+ public void testPopulate()
+ {
+ Transaction tx = pm.currentTransaction();
+ try
+ {
+ tx.begin();
+
+ Project project = new Project();
+ project.setArtifactId( "NMaven.Pom.Model" );
+ project.setGroupId( "NMaven.Model" );
+ project.setVersion( "1.1" );
+ ProjectDependency project2 = new ProjectDependency();
+ project2.setArtifactId( "NMaven.Pom.Model2" );
+ project2.setGroupId( "NMaven.Model2" );
+ project2.setVersion( "1.2" );
+ Set<ProjectDependency> set = new HashSet<ProjectDependency>();
+ set.add( project2 );
+ project.setProjectDependencies( set );
+ pm.makePersistent( project );
+ // pm.makePersistent( set );
+ tx.commit();
+ }
+ finally
+ {
+ if ( tx.isActive() )
+ {
+ tx.rollback();
+ }
+
+ pm.close();
+ }
+ }
+ */
+}
Propchange: incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/JdoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-service/embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-service/embedder/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-service/embedder/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-service/embedder/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
<relativePath>..\..\pom.xml</relativePath>
</parent>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-vendor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-vendor/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-vendor/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-vendor/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/branches/SI_GAC/components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-project</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,16 +33,24 @@
NMaven provides Maven 2.x plugins to support building of .NET applications
</description>
<modules>
- <module>dotnet-core</module>
- <module>dotnet-model</module>
<module>dotnet-artifact</module>
<module>dotnet-assembler</module>
+ <module>dotnet-core</module>
+ <module>dotnet-dao/project</module>
<module>dotnet-embedder</module>
<module>dotnet-executable</module>
<module>dotnet-jetty</module>
+ <module>dotnet-model</module>
<module>dotnet-plugin</module>
<module>dotnet-registry</module>
+ <module>dotnet-repository</module>
<module>dotnet-service/embedder</module>
<module>dotnet-vendor</module>
</modules>
+ <repositories>
+ <repository>
+ <id>aduna.org</id>
+ <url>http://repository.aduna-software.org/maven2</url>
+ </repository>
+ </repositories>
</project>
Modified: incubator/nmaven/branches/SI_GAC/maven-dotnet.iml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/maven-dotnet.iml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/maven-dotnet.iml (original)
+++ incubator/nmaven/branches/SI_GAC/maven-dotnet.iml Thu Jul 12 12:07:57 2007
@@ -18,6 +18,8 @@
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-core/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-core/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-core/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/components/dotnet-dao/project/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/components/dotnet-dao/project/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-embedder/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-embedder/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-embedder/src/test/java" isTestSource="true" />
@@ -36,6 +38,7 @@
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-registry/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-registry/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-repository/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/components/dotnet-repository/src/test/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-vendor/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-vendor/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/components/dotnet-vendor/src/test/java" isTestSource="false" />
@@ -563,6 +566,141 @@
<library>
<CLASSES>
<root url="jar://$localRepository$/org/mortbay/jetty/servlet-api-2.5/6.1.3/servlet-api-2.5-6.1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/jpox/jpox/1.1.7/jpox-1.1.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/javax/jdo/jdo2-api/2.0/jdo2-api-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-repository-api/2.0-beta4/openrdf-repository-api-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-sail-api/2.0-beta4/openrdf-sail-api-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-model/2.0-beta4/openrdf-model-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-query/2.0-beta4/openrdf-query-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-queryalgebra-model/2.0-beta4/openrdf-queryalgebra-model-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-queryresultio-api/2.0-beta4/openrdf-queryresultio-api-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-rio-api/2.0-beta4/openrdf-rio-api-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-sail-memory/2.0-beta4/openrdf-sail-memory-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-sail-nativerdf/2.0-beta4/openrdf-sail-nativerdf-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-sail-inferencer/2.0-beta4/openrdf-sail-inferencer-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/openrdf/openrdf-repository-sail/2.0-beta4/openrdf-repository-sail-2.0-beta4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/info/aduna/aduna-iteration/1.1/aduna-iteration-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,13 +20,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet.plugins</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>maven-dotnet-plugins</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.dotnet.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<packaging>maven-plugin</packaging>
<name>maven-compile-plugin</name>
<description>
@@ -36,6 +36,11 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-registry</artifactId>
+ <version>0.14</version>
</dependency>
</dependencies>
<distributionManagement>
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java Thu Jul 12 12:07:57 2007
@@ -301,6 +301,10 @@
private Artifact getLatestDependencyModification( Set<Artifact> artifacts )
{
+ if ( artifacts == null )
+ {
+ return null;
+ }
Artifact lastModArtifact = null;
for ( Artifact artifact : artifacts )
{
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java Thu Jul 12 12:07:57 2007
@@ -83,6 +83,11 @@
/**
* @component
*/
+ private org.apache.maven.dotnet.registry.DataAccessObjectRegistry daoRegistry;
+
+ /**
+ * @component
+ */
private AssemblerContext assemblerContext;
public void execute()
@@ -94,9 +99,25 @@
{
localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" ).getAbsolutePath();
}
-
+/*
+ for(String id : daoRegistry.getDaoIds())
+ {
+ System.out.println("ID = " + id);
+ }
+ */
+ /*
+ ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project");
+ Project p = dao.getProjectFor( "NMaven.Model", "NMaven.Pom.Model", "1.1");
+ Set<ProjectDependency> ps = p.getProjectDependencies();
+ System.out.println("Size PS = " + ps.size());
+ for(ProjectDependency p1 : ps)
+ {
+ System.out.println(p1.getArtifactId());
+ }
+*/
ArtifactRepository localArtifactRepository =
new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout() );
+
try
{
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(),
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Thu Jul 12 12:07:57 2007
@@ -32,13 +32,7 @@
org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
</compile>
- <process-classes>
- org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
- </process-classes>
<test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
- <install>
- org.apache.maven.dotnet.plugins:maven-install-plugin:install
- </install>
<package>org.apache.maven.dotnet.plugins:maven-webapp-plugin:package</package>
<deploy>
org.apache.maven.dotnet.plugins:maven-webapp-plugin:deploy
@@ -71,9 +65,6 @@
org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
</compile>
- <process-classes>
- org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
- </process-classes>
<test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
<package>org.apache.maven.dotnet.plugins:maven-link-plugin:package</package>
<install>
@@ -113,13 +104,9 @@
org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
</compile>
- <process-classes>
- org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
- </process-classes>
<test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
<install>
- org.apache.maven.dotnet.plugins:maven-install-plugin:install,
- org.apache.maven.dotnet.plugins:maven-install-plugin:gac-install
+ org.apache.maven.dotnet.plugins:maven-install-plugin:install
</install>
<deploy>
org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
@@ -155,9 +142,6 @@
org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
</compile>
- <process-classes>
- org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
- </process-classes>
<test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
<install>
org.apache.maven.dotnet.plugins:maven-install-plugin:install,
@@ -197,13 +181,9 @@
org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
</compile>
<deploy>org.apache.maven.dotnet.plugins:maven-mojo-generator-plugin:generate-bindings</deploy>
- <process-classes>
- org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
- </process-classes>
<test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
<install>
- org.apache.maven.dotnet.plugins:maven-install-plugin:install,
- org.apache.maven.dotnet.plugins:maven-install-plugin:gac-install
+ org.apache.maven.dotnet.plugins:maven-install-plugin:install
</install>
<deploy>
org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
@@ -239,9 +219,6 @@
org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
</compile>
- <process-classes>
- org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
- </process-classes>
<test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
<install>
org.apache.maven.dotnet.plugins:maven-install-plugin:install
@@ -280,9 +257,6 @@
org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
</compile>
- <process-classes>
- org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
- </process-classes>
<test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
<install>
org.apache.maven.dotnet.plugins:maven-install-plugin:install
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet.plugins</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>maven-dotnet-plugins</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>