You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/08/29 02:51:37 UTC
svn commit: r809078 [2/12] - in /geronimo/sandbox/djencks/osgi/framework: ./
assemblies/ assemblies/geronimo-framework/ buildsupport/
buildsupport/buildsupport-maven-plugin/ buildsupport/car-maven-plugin/
buildsupport/car-maven-plugin/src/main/java/org...
Propchange: geronimo/sandbox/djencks/osgi/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 29 00:51:12 2009
@@ -1 +1 @@
-/geronimo/server/trunk/framework:749113,749116-761814
+/geronimo/server/trunk/framework:749113,749116-807432
Propchange: geronimo/sandbox/djencks/osgi/framework/assemblies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: geronimo/sandbox/djencks/osgi/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/assemblies/geronimo-framework/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/assemblies/geronimo-framework/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework.assemblies</groupId>
<artifactId>assemblies</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.assemblies</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/assemblies/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/assemblies/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/assemblies/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>framework</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.framework.assemblies</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/buildsupport-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/buildsupport-maven-plugin/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/buildsupport-maven-plugin/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>buildsupport-maven-plugin</artifactId>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>car-maven-plugin</artifactId>
@@ -40,8 +40,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
@@ -149,6 +149,11 @@
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9-stable-1</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>1.2-alpha-10</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Sat Aug 29 00:51:12 2009
@@ -382,6 +382,9 @@
dependency.getDependency().add(toDependencyType(parent, true, null, false));
}
dependencies.add(dependency);
+// for (Artifact artifact : localDependencies) {
+// Dependency explicitDependency = explicitDependencyMap.get(getKey(artifact));
+// dependencies.add(toDependency(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport));
}
}
@@ -392,7 +395,7 @@
DependencyType dependency = new DependencyType();
dependency.setGroupId(artifact.getGroupId());
dependency.setArtifactId(artifact.getArtifactId());
- dependency.setVersion(includeVersion ? artifact.getVersion() : null);
+ dependency.setVersion(includeVersion ? artifact.getVersionRange().getRecommendedVersion().toString() : null);
dependency.setType(artifact.getType());
if (includeImport) {
ImportType importType = ImportType.ALL;
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java Sat Aug 29 00:51:12 2009
@@ -20,12 +20,25 @@
package org.apache.geronimo.mavenplugins.car;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.FileReader;
+import java.io.Reader;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.model.License;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.osgi.ConfigurationActivator;
+import org.apache.geronimo.kernel.osgi.KernelActivator;
+import org.apache.geronimo.kernel.repository.Maven2Repository;
+import org.apache.geronimo.gbean.GBeanData;
import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
@@ -199,6 +212,7 @@
String[] includes = {
"LICENSE.txt",
"LICENSE",
+
"NOTICE.txt",
"NOTICE",
"DISCLAIMER.txt",
@@ -206,9 +220,37 @@
};
archiver.getArchiver().addDirectory(baseDirectory, "META-INF/", includes, new String[0]);
+ File configFile = new File(new File(getArtifactInRepositoryDir(), "META-INF"), "imports.txt");
+
+ if (configFile.exists()) {
+ if (classpath != null) {
+ archive.addManifestEntry("Class-Path", getClassPath());
+ archive.addManifestEntry("Bundle-Activator", KernelActivator.class.getName());
+ } else {
+ archive.addManifestEntry("Bundle-Activator", ConfigurationActivator.class.getName());
+ }
+ archive.addManifestEntry("Bundle-Name", project.getName());
+ archive.addManifestEntry("Bundle-Vendor", project.getOrganization().getName());
+ archive.addManifestEntry("Bundle-Version", project.getVersion().replace("-", "."));
+ archive.addManifestEntry("Bundle-ManifestVersion", "2");
+ archive.addManifestEntry("Bundle-Description", project.getDescription());
+ archive.addManifestEntry("Bundle-License", ((License)project.getLicenses().get(0)).getUrl());
+ archive.addManifestEntry("Bundle-DocURL", project.getUrl());
+ archive.addManifestEntry("Bundle-SymbolicName", project.getGroupId() + "." + project.getArtifactId());
+// Maven2Repository repo = new Maven2Repository(targetRepository);
+ Reader in = new FileReader(configFile);
+ StringBuilder imports = new StringBuilder();
+ char[] buf = new char[1024];
+ try {
+ int i;
+ while ((i = in.read(buf)) > 0) {
+ imports.append(buf, 0, i);
+ }
+ } finally {
+ in.close();
+ }
+ archive.addManifestEntry("Import-Package", imports.toString());
- if (classpath != null) {
- archive.addManifestEntry("Class-Path", getClassPath());
}
archiver.createArchive(project, archive);
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java Sat Aug 29 00:51:12 2009
@@ -34,6 +34,8 @@
import org.codehaus.plexus.archiver.ArchiverException;
/**
+ * Creates an archive containing a server assembly including all the dependencies in this projects pom.
+ *
* @version $Rev$ $Date$
* @goal archive
*/
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java Sat Aug 29 00:51:12 2009
@@ -33,6 +33,7 @@
import java.util.Collections;
import java.util.List;
import java.util.LinkedHashSet;
+import java.util.Comparator;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
@@ -172,7 +173,7 @@
}
protected File saveTreeListing() throws IOException {
- File treeListFile = new File(dependencyFile.getParentFile(), "treeListing.xml");
+ File treeListFile = new File(dependencyFile.getParentFile(), "treeListing.txt");
OutputStream os = new FileOutputStream(treeListFile);
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os));
try {
@@ -200,6 +201,20 @@
throw new IOException("expected dependencies history directory is not a directory: " + parent);
}
FileWriter out = new FileWriter(file);
+ Collections.sort(pluginArtifactType.getDependency(), new Comparator<DependencyType>() {
+
+ public int compare(DependencyType a, DependencyType b) {
+ int result = a.getGroupId().compareTo(b.getGroupId());
+ if (result != 0) return result;
+ result = a.getArtifactId().compareTo(b.getArtifactId());
+ if (result != 0) return result;
+ return getType(a).compareTo(getType(b));
+ }
+
+ private String getType(DependencyType a) {
+ return a.getType() == null? "jar": a.getType();
+ }
+ });
try {
PluginXmlUtil.writePluginArtifact(pluginArtifactType, out);
} finally {
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Sat Aug 29 00:51:12 2009
@@ -43,6 +43,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.osgi.framework.BundleContext;
/**
* Installs Geronimo module CAR files into a target repository to support assembly.
@@ -143,6 +144,9 @@
*/
private Set installedArtifacts = new HashSet();
+ //TODO OSGI figure out what this might be
+ private BundleContext bundleContext;
+
public void execute() throws MojoExecutionException, MojoFailureException {
getDependencies(project, false);
Maven2RepositoryAdapter.ArtifactLookup lookup = new ArtifactLookupImpl();
@@ -166,10 +170,10 @@
DownloadResults downloadPoller = new DownloadResults();
String targetServerPath = targetServerDirectory.getAbsolutePath();
- Kernel kernel = new BasicKernel("Assembly");
+ Kernel kernel = new BasicKernel("Assembly", bundleContext);
PluginRepositoryList pluginRepoList = new PluginRepositoryDownloader(Collections.singletonMap(localRepo, (String[]) null), true);
try {
- PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, installedPluginsList, servers, pluginRepoList, kernel, getClass().getClassLoader());
+ PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, installedPluginsList, servers, pluginRepoList, kernel, bundleContext);
installer.install(pluginList, sourceRepo, true, null, null, downloadPoller);
if (overrides != null) {
for (Override override: this.overrides) {
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenAttributeStore.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenAttributeStore.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenAttributeStore.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/MavenAttributeStore.java Sat Aug 29 00:51:12 2009
@@ -28,6 +28,7 @@
import org.apache.geronimo.gbean.ReferencePatterns;
import org.apache.geronimo.kernel.config.ManageableAttributeStore;
import org.apache.geronimo.kernel.repository.Artifact;
+import org.osgi.framework.Bundle;
import java.io.IOException;
import java.util.Collection;
@@ -43,11 +44,11 @@
public MavenAttributeStore() {
}
- public Collection applyOverrides(Artifact configurationName, Collection<GBeanData> datas, ClassLoader classLoader) {
+ public Collection applyOverrides(Artifact configurationName, Collection<GBeanData> datas, Bundle bundle) {
return datas;
}
- public void setValue(Artifact configurationName, AbstractName gbean, GAttributeInfo attribute, Object value, ClassLoader classLoader) {
+ public void setValue(Artifact configurationName, AbstractName gbeanName, GAttributeInfo attribute, Object value, Bundle bundle) {
}
public void setReferencePatterns(Artifact configurationName, AbstractName gbean, GReferenceInfo reference, ReferencePatterns patterns) {
@@ -56,7 +57,7 @@
public void setShouldLoad(Artifact configurationName, AbstractName gbean, boolean load) {
}
- public void addGBean(Artifact configurationName, GBeanData gbeanData, ClassLoader classLoader) {
+ public void addGBean(Artifact configurationName, GBeanData gbeanData, Bundle bundle) {
}
public void save() throws IOException {
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Sat Aug 29 00:51:12 2009
@@ -55,6 +55,7 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.util.FileUtils;
+import org.osgi.framework.BundleContext;
/**
* Build a Geronimo Configuration using the local Maven infrastructure.
@@ -119,7 +120,7 @@
/**
* The plan file for the CAR.
*
- * @parameter expression="${project.build.directory}/resources/META-INF/plan.xml"
+ * @parameter expression="${project.build.directory}/work/plan.xml"
* @required
*/
private File planFile = null;
@@ -177,6 +178,7 @@
* @required
*/
protected String pluginMetadataFileName = null;
+ private BundleContext bundleContext;
//
// Mojo
@@ -259,7 +261,7 @@
boot.setExpanded(true);
File targetFile = new File(targetDir.toURI().resolve(pluginMetadataFileName));
- URL artifactURL = targetFile.toURL();
+ URL artifactURL = targetFile.toURI().toURL();
new MavenDependencyResolver().resolve(artifactURL, OneClassLoaderPerJarClassLoaderBuilder.GLOBAL_CL_REGISTER, mavenToGeronimoArtifact(getProject().getArtifact()));
boot.bootstrap();
}
@@ -352,7 +354,7 @@
}
// boot one ourselves
- kernel = KernelFactory.newInstance().createKernel(KERNEL_NAME);
+ kernel = KernelFactory.newInstance(bundleContext).createKernel(KERNEL_NAME);
kernel.boot();
bootDeployerSystem();
@@ -382,7 +384,7 @@
// NOTE: Install an adapter for the source repository that will leverage the Maven2 repository subsystem
// to allow for better handling of SNAPSHOT values.
//
- GBeanData repoGBean = bootstrap.addGBean("SourceRepository", GBeanInfo.getGBeanInfo(Maven2RepositoryAdapter.class.getName(), cl));
+ GBeanData repoGBean = bootstrap.addGBean("SourceRepository", GBeanInfo.getGBeanInfo(Maven2RepositoryAdapter.class.getName(), bundleContext.getBundle()));
Maven2RepositoryAdapter.ArtifactLookup lookup = new Maven2RepositoryAdapter.ArtifactLookup() {
private Maven2RepositoryAdapter.ArtifactLookup getDelegate() {
return lookupHolder.get();
@@ -401,7 +403,7 @@
repoNames.add(repoGBean.getAbstractName());
// Target repo
- GBeanData targetRepoGBean = bootstrap.addGBean("TargetRepository", GBeanInfo.getGBeanInfo(Maven2Repository.class.getName(), cl));
+ GBeanData targetRepoGBean = bootstrap.addGBean("TargetRepository", GBeanInfo.getGBeanInfo(Maven2Repository.class.getName(), bundleContext.getBundle()));
URI targetRepositoryURI = targetRepository.toURI();
targetRepoGBean.setAttribute("root", targetRepositoryURI);
repoNames.add(targetRepoGBean.getAbstractName());
@@ -417,7 +419,7 @@
Set storeNames = new HashSet();
// Source config store
- GBeanInfo configStoreInfo = GBeanInfo.getGBeanInfo(MavenConfigStore.class.getName(), cl);
+ GBeanInfo configStoreInfo = GBeanInfo.getGBeanInfo(MavenConfigStore.class.getName(), bundleContext.getBundle());
GBeanData storeGBean = bootstrap.addGBean("ConfigStore", configStoreInfo);
if (configStoreInfo.getReference("Repository") != null) {
storeGBean.setReferencePattern("Repository", repoGBean.getAbstractName());
@@ -425,7 +427,7 @@
storeNames.add(storeGBean.getAbstractName());
// Target config store
- GBeanInfo targetConfigStoreInfo = GBeanInfo.getGBeanInfo(RepositoryConfigurationStore.class.getName(), cl);
+ GBeanInfo targetConfigStoreInfo = GBeanInfo.getGBeanInfo(RepositoryConfigurationStore.class.getName(), bundleContext.getBundle());
GBeanData targetStoreGBean = bootstrap.addGBean("TargetConfigStore", targetConfigStoreInfo);
if (targetConfigStoreInfo.getReference("Repository") != null) {
targetStoreGBean.setReferencePattern("Repository", targetRepoGBean.getAbstractName());
@@ -436,17 +438,17 @@
targetSet = true;
GBeanData attrManagerGBean = bootstrap.addGBean("AttributeStore", MavenAttributeStore.GBEAN_INFO);
- GBeanData configManagerGBean = bootstrap.addGBean("ConfigManager", KernelConfigurationManager.GBEAN_INFO);
+ GBeanData configManagerGBean = bootstrap.addGBean("ConfigManager", KernelConfigurationManager.class);
configManagerGBean.setReferencePatterns("Stores", new ReferencePatterns(storeNames));
configManagerGBean.setReferencePattern("AttributeStore", attrManagerGBean.getAbstractName());
configManagerGBean.setReferencePattern("ArtifactManager", artifactManagerGBean.getAbstractName());
configManagerGBean.setReferencePattern("ArtifactResolver", artifactResolverGBean.getAbstractName());
configManagerGBean.setReferencePatterns("Repositories", repoPatterns);
- ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, cl);
+ ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
File targetFile = new File(targetDir.toURI().resolve(pluginMetadataFileName));
- URL artifactURL = targetFile.toURL();
+ URL artifactURL = targetFile.toURI().toURL();
new MavenDependencyResolver().resolve(artifactURL, OneClassLoaderPerJarClassLoaderBuilder.GLOBAL_CL_REGISTER, mavenToGeronimoArtifact(getProject().getArtifact()));
}
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java Sat Aug 29 00:51:12 2009
@@ -68,7 +68,7 @@
/**
* Directory to put the processed plan in.
*
- * @parameter expression="${project.build.directory}/resources/META-INF"
+ * @parameter expression="${project.build.directory}/work"
* @required
*/
protected File targetDir = null;
@@ -76,7 +76,7 @@
/**
* XXX
*
- * @parameter expression="${project.build.directory}/resources/META-INF/plan.xml"
+ * @parameter expression="${project.build.directory}/work/plan.xml"
* @required
*/
protected File targetFile = null;
@@ -100,7 +100,7 @@
/**
* we copy the plan here for filtering, then add env stuff.
*
- * @parameter expression="${project.build.directory}/fliteredplan/plan.xml"
+ * @parameter expression="${project.build.directory}/work/filteredplan.xml"
* @required
*/
protected File filteredPlanFile;
Propchange: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/pom.xml Sat Aug 29 00:51:12 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?><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">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -18,7 +18,7 @@
<parent>
<artifactId>buildsupport</artifactId>
<groupId>org.apache.geronimo.buildsupport</groupId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>geronimo-assembly-archetype</artifactId>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml Sat Aug 29 00:51:12 2009
@@ -8,7 +8,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
</properties>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml Sat Aug 29 00:51:12 2009
@@ -8,7 +8,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
</properties>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-maven-plugin/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>geronimo-maven-plugin</artifactId>
Propchange: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/pom.xml Sat Aug 29 00:51:12 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?><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">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -18,7 +18,7 @@
<parent>
<artifactId>buildsupport</artifactId>
<groupId>org.apache.geronimo.buildsupport</groupId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>geronimo-plugin-archetype</artifactId>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Sat Aug 29 00:51:12 2009
@@ -8,20 +8,20 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
<clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${geronimoVersion}/car</connectorDeployer>
<openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
<openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
<axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
<tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+ <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jetty6Deployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
</properties>
@@ -61,7 +61,7 @@
<!-- gbean deployer is default. For jee apps include all deployers your app needs, see properties -->
<!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
<!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
- <!--<deploymentConfig>${jetty6Deployer}</deploymentConfig>-->
+ <!--<deploymentConfig>${jettyDeployer}</deploymentConfig>-->
<!--<deploymentConfig>${jasperDeployer}</deploymentConfig>-->
<!--<deploymentConfig>${jpaDeployer}</deploymentConfig>-->
</deploymentConfigs>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Sat Aug 29 00:51:12 2009
@@ -8,20 +8,20 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
<clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${geronimoVersion}/car</connectorDeployer>
<openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
<openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
<axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
<tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+ <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jetty6Deployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
</properties>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>framework</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>testsuite-maven-plugin</artifactId>
@@ -53,7 +53,8 @@
<dependency>
<groupId>jtidy</groupId>
<artifactId>jtidy</artifactId>
- <version>8.0-20060801</version>
+ <!--<version>8.0-20060801</version>-->
+ <version>4aug2000r7-dev</version>
</dependency>
<dependency>
<groupId>ant</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java Sat Aug 29 00:51:12 2009
@@ -74,6 +74,7 @@
*/
public class ResultsSummaryMojo
extends MojoSupport {
+ //TODO for this to actually work most likely we need to get a more up to date jtidy such as the one formerly in the svn repo version 8.0-20060801
/**
* @component
*/
Modified: geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>client-system</artifactId>
@@ -76,8 +76,8 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
@@ -138,6 +138,11 @@
</element>
<element>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ <version>${version}</version>
+ </element>
+ <element>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</element>
@@ -199,7 +204,7 @@
<category>Geronimo Core</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
<artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
<artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/${version}/car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml Sat Aug 29 00:51:12 2009
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>geronimo-boilerplate</artifactId>
@@ -196,7 +196,7 @@
<configuration>
<tasks>
<echo>Copying README, and RELEASE_NOTES txt files ${project.basedir}/../.. to underlay - ${project.build.outputDirectory}/contents</echo>
- <copy todir="${project.build.outputDirectory}/contents" failonerror="true" overwrite="true" >
+ <copy todir="${project.build.outputDirectory}/contents" failonerror="true" overwrite="true">
<fileset dir="${project.basedir}/../..">
<include name="README.txt" />
<include name="RELEASE_NOTES-${pom.version}.txt" />
@@ -217,10 +217,10 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="${project.build.outputDirectory}"/>
+ <mkdir dir="${project.build.outputDirectory}" />
<copy todir="${project.build.outputDirectory}">
- <fileset dir="${project.build.directory}/${project.build.finalName}.dir/${project.build.finalName}">
- <include name="**"/>
+ <fileset dir="${project.build.directory}/${project.build.finalName}">
+ <include name="**" />
</fileset>
</copy>
</tasks>
@@ -232,28 +232,19 @@
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-plugin-metadata</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>prepare-metadata</goal>
- </goals>
- <configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- <category>Geronimo Core</category>
- <instance>
- <plugin-artifact>
- <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
- <copy-file relative-to="server" dest-dir="">instance/</copy-file>
- </plugin-artifact>
- </instance>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Geronimo Core</category>
+ <instance>
+ <plugin-artifact>
+ <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
+ <copy-file relative-to="server" dest-dir="">instance/</copy-file>
+ </plugin-artifact>
+ </instance>
+ </configuration>
</plugin>
<plugin>
@@ -264,7 +255,7 @@
<id>boilerplate</id>
<phase>compile</phase>
<goals>
- <goal>directory-inline</goal>
+ <goal>directory-single</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml Sat Aug 29 00:51:12 2009
@@ -20,6 +20,8 @@
<assembly>
<id>boilerplate</id>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
@@ -27,7 +29,15 @@
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
-
+
+ <files>
+ <file>
+ <source>src/main/underlay/contents/etc/gsh-classworlds.conf</source>
+ <outputDirectory>contents/etc/</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
+
<dependencySets>
<dependencySet>
<outputDirectory>contents/lib/boot</outputDirectory>
@@ -63,6 +73,7 @@
<include>org.apache.xbean:xbean-reflect</include>
<include>com.thoughtworks.xstream:xstream</include>
<include>org.apache.geronimo.framework:geronimo-cli</include>
+ <include>org.apache.geronimo.framework:geronimo-crypto</include>
<include>org.apache.geronimo.framework:geronimo-kernel</include>
<include>org.apache.geronimo.framework:geronimo-system</include>
<include>org.apache.geronimo.framework:geronimo-deploy-jsr88-bootstrapper</include>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.sh?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.sh (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.sh Sat Aug 29 00:51:12 2009
@@ -181,7 +181,9 @@
fi
fi
-exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
+"$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
-jar "$GERONIMO_HOME"/bin/deployer.jar "$@"
+
+stty echo
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/gsh-classworlds.conf Sat Aug 29 00:51:12 2009
@@ -60,12 +60,12 @@
load ${gshell.home}/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-*.jar
load ${gshell.home}/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-*.jar
load ${gshell.home}/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.2-SNAPSHOT/geronimo-cli-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.2-SNAPSHOT/geronimo-commands-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.2-SNAPSHOT/geronimo-deploy-config-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.2-SNAPSHOT/geronimo-deploy-jsr88-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.2-SNAPSHOT/geronimo-deploy-tool-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.2-SNAPSHOT/geronimo-system-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.2-SNAPSHOT/geronimo-plugin-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.2-SNAPSHOT/geronimo-common-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.2-SNAPSHOT/geronimo-crypto-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/${version}/geronimo-cli-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/${version}/geronimo-commands-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/${version}/geronimo-deploy-config-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/${version}/geronimo-deploy-jsr88-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/${version}/geronimo-deploy-tool-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/${version}/geronimo-system-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/${version}/geronimo-plugin-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/${version}/geronimo-common-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/${version}/geronimo-crypto-*.jar
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server,default.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server%2Cdefault.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server,default.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server,default.groovy Sat Aug 29 00:51:12 2009
@@ -22,7 +22,10 @@
//
// Append some reasonable java flags if none were configured already
-if (command.javaFlags.empty) {
+if (command.profiles.contains('java6')) {
+ command.javaFlags << '-XX:MaxPermSize=512m'
+ command.javaFlags << '-Xmx2048m'
+} else if (command.javaFlags.empty) {
command.javaFlags << '-Xmx512m'
}
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>geronimo-gbean-deployer</artifactId>
@@ -123,7 +123,7 @@
<attribute name="remoteDeployAddress">http://#{RemoteDeployHostname}:#{HTTPPort + PortOffset}</attribute>
</gbean>
</config-xml-content>
- <config-xml-content server="offline"/>
+ <config-xml-content server="offline" />
<config-substitution key="RemoteDeployHostname">localhost</config-substitution>
<copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>
</plugin-artifact>
@@ -164,6 +164,7 @@
</plugins>
</build>
</profile>
+
</profiles>
</project>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
- <artifactId>j2ee-system</artifactId>
+ <artifactId>j2ee-system-2</artifactId>
<name>Geronimo Configs :: J2EE System</name>
<packaging>car</packaging>
@@ -88,10 +88,10 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
@@ -181,8 +181,8 @@
</element>
<!-- TODO bad idea... temp, for plugins -->
<element>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</element>
<element>
<groupId>com.sun.xml.bind</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml Sat Aug 29 00:51:12 2009
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
+ xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<name>Geronimo Configs :: J2EE System</name>
<category>Geronimo Core</category>
<description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
@@ -26,7 +27,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency start="true">
@@ -75,8 +76,8 @@
<type>jar</type>
</dependency>
<dependency start="true">
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
<type>jar</type>
</dependency>
<dependency start="true">
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<moduleId>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>car</type>
</moduleId>
<dependencies>
@@ -74,11 +74,11 @@
<artifactId>ognl</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/validate.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/validate.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/validate.groovy Sat Aug 29 00:51:12 2009
@@ -47,4 +47,4 @@
assertSame('src/test/resources/META-INF/geronimo-plugin.xml', 'target/resources/META-INF/geronimo-plugin.xml')
-assertSame('src/test/resources/META-INF/plan.xml', 'target/resources/META-INF/plan.xml')
+assertSame('src/test/resources/META-INF/plan.xml', 'target/work/plan.xml')
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
@@ -88,10 +88,10 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
@@ -181,8 +181,8 @@
</element>
<!-- TODO bad idea... temp, for plugins -->
<element>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</element>
<element>
<groupId>com.sun.xml.bind</groupId>
@@ -205,100 +205,7 @@
<category>Geronimo Core</category>
<osiApproved>true</osiApproved>
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.7</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>2.2-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
- <version>2.2-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>3.1</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.7</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.2</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>2.2-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- </dependencies>
+ <geronimoVersion>${version}</geronimoVersion>
</configuration>
</plugin>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml Sat Aug 29 00:51:12 2009
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency start="false">
@@ -44,7 +44,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -56,7 +56,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -96,9 +96,9 @@
<type>jar</type>
</dependency>
<dependency start="false">
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>1.0</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -110,7 +110,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<moduleId>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>car</type>
</moduleId>
<dependencies>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -106,13 +106,13 @@
<type>jar</type>
<import>classes</import>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/validate.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/validate.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/validate.groovy Sat Aug 29 00:51:12 2009
@@ -47,4 +47,4 @@
assertSame('src/test/resources/META-INF/geronimo-plugin.xml', 'target/resources/META-INF/geronimo-plugin.xml')
-assertSame('src/test/resources/META-INF/plan.xml', 'target/resources/META-INF/plan.xml')
+assertSame('src/test/resources/META-INF/plan.xml', 'target/work/plan.xml')
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/pom.xml Sat Aug 29 00:51:12 2009
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml Sat Aug 29 00:51:12 2009
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
</module-id>
<jvm-version>1.5</jvm-version>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/pom.xml Sat Aug 29 00:51:12 2009
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml Sat Aug 29 00:51:12 2009
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>jar</type>
</module-id>
<jvm-version>1.5</jvm-version>
@@ -53,7 +53,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</dependency>
<obsoletes>
<groupId>commons-logging</groupId>
Propchange: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml Sat Aug 29 00:51:12 2009
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project>
+<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.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.plugins.classloaders</groupId>
@@ -63,7 +63,7 @@
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Classloaders</category>
<instance>
- <plugin-artifact></plugin-artifact>
+ <plugin-artifact />
</instance>
</configuration>
</plugin>
Propchange: geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>gshell-framework</artifactId>
@@ -72,7 +72,7 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</configuration>
</plugin>
</plugins>
Propchange: geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>gshell-geronimo</artifactId>
@@ -89,7 +89,7 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</configuration>
</plugin>
</plugins>
Propchange: geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+
Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>gshell-remote</artifactId>
@@ -74,7 +74,7 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</configuration>
</plugin>
</plugins>