[jboss-cvs] JBossAS SVN: r97275 - in projects/ejb3/trunk/package-manager/src/main: java/org/jboss/ejb3/packagemanager/script/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 1 23:39:41 EST 2009
Author: jaikiran
Date: 2009-12-01 23:39:41 -0500 (Tue, 01 Dec 2009)
New Revision: 97275
Modified:
projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/dependency/impl/IvyDependencyManager.java
projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/script/impl/AntScriptProcessor.java
projects/ejb3/trunk/package-manager/src/main/resources/ivy-default-settings.xml
Log:
EJBTHREE-1942 Minor changes to ivy settings and the ant processor
Modified: projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/dependency/impl/IvyDependencyManager.java
===================================================================
--- projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/dependency/impl/IvyDependencyManager.java 2009-12-02 03:26:18 UTC (rev 97274)
+++ projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/dependency/impl/IvyDependencyManager.java 2009-12-02 04:39:41 UTC (rev 97275)
@@ -128,12 +128,12 @@
ModuleRevisionId mRID = md.getModuleRevisionId();
RetrieveOptions retrieveOptions = new RetrieveOptions();
- String pattern = pkgTmpDir.getAbsolutePath() + "/[organization]/[module]/[type]/[artifact]-[revision].[ext]";
+ String pattern = pkgTmpDir.getAbsolutePath() + "/[organization]/[module]/[type]/[artifact]-[revision](-[classifier]).[ext]";
retrieveOptions.setDestIvyPattern(pattern);
// We only retrieve "jar" type artifacts (i.e. we are *not* interested in "source"
// or "javadoc" or any other artifact types
- Filter jarArtifactFilter = FilterHelper.getArtifactTypeFilter("jar");
- retrieveOptions.setArtifactFilter(jarArtifactFilter);
+ //Filter jarArtifactFilter = FilterHelper.getArtifactTypeFilter(new String[]{"jar", "package"});
+ //retrieveOptions.setArtifactFilter(jarArtifactFilter);
// default logging option
retrieveOptions.setLog(LogOptions.LOG_DEFAULT);
Modified: projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/script/impl/AntScriptProcessor.java
===================================================================
--- projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/script/impl/AntScriptProcessor.java 2009-12-02 03:26:18 UTC (rev 97274)
+++ projects/ejb3/trunk/package-manager/src/main/java/org/jboss/ejb3/packagemanager/script/impl/AntScriptProcessor.java 2009-12-02 04:39:41 UTC (rev 97275)
@@ -60,12 +60,7 @@
public void processPostInstallScript(PackageManagerContext pkgManagerCtx, PackageContext pkgCtx, File script)
throws ScriptProcessingException
{
- // Set the properties JBOSS_HOME and PM_HOME for the
- // build scripts to use (if they find it necessary)
- Map<String, String> props = new HashMap<String, String>();
- props.put("JBOSS_HOME", pkgManagerCtx.getJBossServerHome());
- props.put("PM_HOME", pkgManagerCtx.getPackageManagerEnvironment().getPackageManagerHome().getAbsolutePath());
- Project antProject = this.buildProject(script, pkgCtx.getPackageRoot(), props);
+ Project antProject = this.buildProject(script, pkgCtx.getPackageRoot(), this.getCommonAntProjectProperties(pkgManagerCtx));
this.runTarget(antProject, "post-install");
}
@@ -77,15 +72,9 @@
public void processPostUnInstallScript(PackageManagerContext pkgManagerCtx, PersistentPackage installedPackage, File script)
throws ScriptProcessingException
{
- // Set the properties JBOSS_HOME and PM_HOME for the
- // build scripts to use (if they find it necessary)
- Map<String, String> props = new HashMap<String, String>();
- props.put("JBOSS_HOME", pkgManagerCtx.getJBossServerHome());
- props.put("PM_HOME", pkgManagerCtx.getPackageManagerEnvironment().getPackageManagerHome().getAbsolutePath());
-
// TODO: What should basedir point to? Let's right now point it to the folder containing the
// script file
- Project antProject = this.buildProject(script, script.getParentFile(), props);
+ Project antProject = this.buildProject(script, script.getParentFile(), this.getCommonAntProjectProperties(pkgManagerCtx));
this.runTarget(antProject, "post-uninstall");
}
@@ -97,12 +86,7 @@
public void processPreInstallScript(PackageManagerContext pkgManagerCtx, PackageContext pkgCtx, File script)
throws ScriptProcessingException
{
- // Set the properties JBOSS_HOME and PM_HOME for the
- // build scripts to use (if they find it necessary)
- Map<String, String> props = new HashMap<String, String>();
- props.put("JBOSS_HOME", pkgManagerCtx.getJBossServerHome());
- props.put("PM_HOME", pkgManagerCtx.getPackageManagerEnvironment().getPackageManagerHome().getAbsolutePath());
- Project antProject = this.buildProject(script, pkgCtx.getPackageRoot(), props);
+ Project antProject = this.buildProject(script, pkgCtx.getPackageRoot(), this.getCommonAntProjectProperties(pkgManagerCtx));
this.runTarget(antProject, "pre-install");
}
@@ -114,15 +98,9 @@
public void processPreUnInstallScript(PackageManagerContext pkgManagerCtx, PersistentPackage installedPackage, File script)
throws ScriptProcessingException
{
- // Set the properties JBOSS_HOME and PM_HOME for the
- // build scripts to use (if they find it necessary)
- Map<String, String> props = new HashMap<String, String>();
- props.put("JBOSS_HOME", pkgManagerCtx.getJBossServerHome());
- props.put("PM_HOME", pkgManagerCtx.getPackageManagerEnvironment().getPackageManagerHome().getAbsolutePath());
-
// TODO: What should basedir point to? Let's right now point it to the folder containing the
// script file
- Project antProject = this.buildProject(script, script.getParentFile(), props);
+ Project antProject = this.buildProject(script, script.getParentFile(), this.getCommonAntProjectProperties(pkgManagerCtx));
this.runTarget(antProject, "pre-uninstall");
@@ -139,7 +117,6 @@
antProject.addBuildListener(new AntBuildListener());
// Set the basedir for the ant project
antProject.setBaseDir(baseDir);
-
if (antProperties != null)
{
Set<Entry<String, String>> entries = antProperties.entrySet();
@@ -151,19 +128,25 @@
}
}
- // antProject.setProperty("JBOSS_HOME", pkgManagerCtx.getJBossServerHome());
- // antProject.setProperty("PM_HOME", pkgManagerCtx.getPackageManagerEnvironment().getPackageManagerHome()
- // .getAbsolutePath());
// init the project
antProject.init();
ProjectHelper antProjHelper = ProjectHelper.getProjectHelper();
// parse the project from the build file
antProjHelper.parse(antProject, scriptFile);
-
return antProject;
}
+ private Map<String, String> getCommonAntProjectProperties(PackageManagerContext pkgManagerCtx)
+ {
+ // Set the properties JBOSS_HOME and PM_HOME for the
+ // build scripts to use (if they find it necessary)
+ Map<String, String> props = new HashMap<String, String>();
+ props.put("JBOSS_HOME", pkgManagerCtx.getJBossServerHome());
+ props.put("PM_HOME", pkgManagerCtx.getPackageManagerEnvironment().getPackageManagerHome().getAbsolutePath());
+ props.put("PM_TMP_DIR", pkgManagerCtx.getPackageManagerEnvironment().getPackageManagerTmpDir().getAbsolutePath());
+ return props;
+ }
private void runTarget(Project antProject, String targetName) throws ScriptProcessingException
{
// check whether the target exists in the build file
Modified: projects/ejb3/trunk/package-manager/src/main/resources/ivy-default-settings.xml
===================================================================
--- projects/ejb3/trunk/package-manager/src/main/resources/ivy-default-settings.xml 2009-12-02 03:26:18 UTC (rev 97274)
+++ projects/ejb3/trunk/package-manager/src/main/resources/ivy-default-settings.xml 2009-12-02 04:39:41 UTC (rev 97275)
@@ -1,10 +1,24 @@
<ivysettings>
<settings defaultResolver="defaultRepoChain"/>
+ <caches artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision](-[classifier]).[ext]"
+ checkUpToDate="true"/>
+
<resolvers>
+
+ <ibiblio name="ibiblio" m2compatible="true"
+ pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" checkmodified="true"/>
+
+ <ibiblio name="jboss-snap-m2-repo" root="http://snapshots.jboss.org/maven2/" m2compatible="true"
+ pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" checkmodified="true"
+ changingPattern=".*-SNAPSHOT"/>
+
+ <ibiblio name="jboss-m2-repo" root="http://repository.jboss.org/maven2/" m2compatible="true"
+ pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" checkmodified="true"/>
+
<chain name="defaultRepoChain">
- <ibiblio name="jboss-snap-m2-repo" root="http://snapshots.jboss.org/maven2/" m2compatible="true" />
- <ibiblio name="jboss-m2-repo" root="http://repository.jboss.org/maven2/" m2compatible="true" />
- <ibiblio name="ibiblio" m2compatible="true" />
+ <resolver ref="jboss-snap-m2-repo"/>
+ <resolver ref="jboss-m2-repo"/>
+ <resolver ref="ibiblio"/>
</chain>
</resolvers>
</ivysettings>
More information about the jboss-cvs-commits
mailing list