Author: veithen
Date: Sun Aug 1 21:33:37 2010
New Revision: 981324
URL: http://svn.apache.org/viewvc?rev=981324&view=rev
Log:
Merged r981220,981237,981293 to the 1.5 branch.
Added:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
- copied, changed from r981237,
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
Removed:
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=981324&r1=981323&r2=981324&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Sun Aug
1 21:33:37 2010
@@ -187,57 +187,16 @@
<build>
<plugins>
<plugin>
- <!-- This builds the Axis2 repository with the modules and
services -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>directory-single</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <finalName>tmp-repository</finalName>
-
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
-
<descriptor>src/main/assembly/repository.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!-- This generates the modules.list and services.list files
-->
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-resources</phase>
<goals>
- <goal>execute</goal>
+ <goal>create-repository</goal>
</goals>
<configuration>
- <source>
- def modulesdir = new
File(project.build.directory, "tmp-repository/modules");
- def moduleslist = new File(modulesdir,
"modules.list");
- moduleslist.delete();
- modulesdir.eachFile({
- if (it.name.endsWith(".mar")) {
- moduleslist.append("$it.name\n");
- }
- })
-
- def servicesdir = new
File(project.build.directory, "tmp-repository/services");
- def serviceslist = new File(servicesdir,
"services.list");
- serviceslist.delete();
- servicesdir.eachFile({
- if (it.name.endsWith(".aar")) {
- serviceslist.append("$it.name\n");
- }
- })
- </source>
+
<outputDirectory>${project.build.directory}/tmp-repository</outputDirectory>
+ <generateFileLists>true</generateFileLists>
</configuration>
</execution>
</executions>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/parent:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=981324&r1=981323&r2=981324&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Sun Aug 1 21:33:37 2010
@@ -21,9 +21,10 @@ package org.apache.axis2.maven2.repo;
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -43,13 +44,6 @@ import org.codehaus.plexus.util.FileUtil
public abstract class AbstractCreateRepositoryMojo extends AbstractMojo {
/**
- * @parameter expression="${project}"
- * @readonly
- * @required
- */
- private MavenProject project;
-
- /**
* @component
*/
private ArtifactFactory factory;
@@ -60,11 +54,18 @@ public abstract class AbstractCreateRepo
private ArtifactResolver resolver;
/**
+ * @parameter expression="${project.artifacts}"
+ * @readonly
+ * @required
+ */
+ private Set<Artifact> projectArtifacts;
+
+ /**
* @parameter expression="${project.remoteArtifactRepositories}"
* @readonly
* @required
*/
- protected List remoteRepositories;
+ private List remoteRepositories;
/**
* @parameter expression="${localRepository}"
@@ -74,6 +75,13 @@ public abstract class AbstractCreateRepo
private ArtifactRepository localRepository;
/**
+ * @parameter expression="${project.collectedProjects}"
+ * @required
+ * @readonly
+ */
+ private List<MavenProject> collectedProjects;
+
+ /**
* The directory (relative to the repository root) where AAR files are
copied. This should be
* set to the same value as the <tt>ServicesDirectory</tt> property in
<tt>axis2.xml</tt>.
*
@@ -105,12 +113,58 @@ public abstract class AbstractCreateRepo
*/
private String configurationDirectory;
+ /**
+ * Specifies whether the plugin should scan the project dependencies for
AAR and MAR artifacts.
+ *
+ * @parameter default-value="true"
+ */
+ private boolean useDependencies;
+
+ /**
+ * Specifies whether the plugin should scan Maven modules for AAR and MAR
artifacts. This
+ * parameter only has an effect for multimodule projects.
+ *
+ * @parameter default-value="true"
+ */
+ private boolean useModules;
+
+ /**
+ * Specifies whether the plugin should generate <tt>services.list</tt> and
<tt>modules.list</tt>
+ * files.
+ *
+ * @parameter default-value="false"
+ */
+ private boolean generateFileLists;
+
+ /**
+ * Specifies whether the plugin strips version numbers from AAR files.
+ *
+ * @parameter default-value="true"
+ */
+ private boolean stripServiceVersion;
+
+ /**
+ * Specifies whether the plugin strips version numbers from MAR files.
+ *
+ * @parameter default-value="false"
+ */
+ private boolean stripModuleVersion;
+
protected abstract String getScope();
protected abstract File getOutputDirectory();
public void execute() throws MojoExecutionException, MojoFailureException {
- Set artifacts = project.getArtifacts();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
+ if (useDependencies) {
+ artifacts.addAll(projectArtifacts);
+ }
+ if (useModules) {
+ for (MavenProject project : collectedProjects) {
+ artifacts.add(project.getArtifact());
+ artifacts.addAll(project.getAttachedArtifacts());
+ }
+ }
FilterArtifacts filter = new FilterArtifacts();
filter.addFilter(new ScopeFilter(getScope(), null));
filter.addFilter(new TypeFilter("aar,mar", null));
@@ -121,19 +175,16 @@ public abstract class AbstractCreateRepo
}
artifacts = replaceIncompleteArtifacts(artifacts);
File outputDirectory = getOutputDirectory();
- File servicesDirectory = new File(outputDirectory,
this.servicesDirectory);
- File modulesDirectory = new File(outputDirectory,
this.modulesDirectory);
- for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
- Artifact artifact = (Artifact)it.next();
+ Map<String,ArchiveDeployer> deployers = new
HashMap<String,ArchiveDeployer>();
+ deployers.put("aar", new ArchiveDeployer(outputDirectory,
servicesDirectory, "services.list", generateFileLists, stripServiceVersion));
+ deployers.put("mar", new ArchiveDeployer(outputDirectory,
modulesDirectory, "modules.list", generateFileLists, stripModuleVersion));
+ for (Artifact artifact : artifacts) {
String type = artifact.getType();
- String destFileName = artifact.getArtifactId() + "-" +
artifact.getVersion() + "." + type;
- File targetDir = type.equals("mar") ? modulesDirectory :
servicesDirectory;
- getLog().info("Adding " + destFileName);
- try {
- FileUtils.copyFile(artifact.getFile(), new File(targetDir,
destFileName));
- } catch (IOException ex) {
- throw new MojoExecutionException("Error copying " +
destFileName + ": " + ex.getMessage(), ex);
+ ArchiveDeployer deployer = deployers.get(type);
+ if (deployer == null) {
+ throw new MojoExecutionException("No deployer found for
artifact type " + type);
}
+ deployer.deploy(getLog(), artifact);
}
if (axis2xml != null) {
getLog().info("Copying axis2.xml");
@@ -145,6 +196,9 @@ public abstract class AbstractCreateRepo
throw new MojoExecutionException("Error copying axis2.xml
file: " + ex.getMessage(), ex);
}
}
+ for (ArchiveDeployer deployer : deployers.values()) {
+ deployer.finish(getLog());
+ }
}
/**
@@ -157,10 +211,9 @@ public abstract class AbstractCreateRepo
* @return a set of {...@link Artifact} objects built as described above
* @throws MojoExecutionException
*/
- private Set replaceIncompleteArtifacts(Set artifacts) throws
MojoExecutionException {
- Set result = new HashSet();
- for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
- Artifact artifact = (Artifact)it.next();
+ private Set<Artifact> replaceIncompleteArtifacts(Set<Artifact> artifacts)
throws MojoExecutionException {
+ Set<Artifact> result = new HashSet<Artifact>();
+ for (Artifact artifact : artifacts) {
File file = artifact.getFile();
if (file != null && file.isDirectory()) {
artifact =
factory.createDependencyArtifact(artifact.getGroupId(),
artifact.getArtifactId(),
Copied:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
(from r981237,
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java?p2=axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java&p1=axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java&r1=981237&r2=981324&rev=981324&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
Sun Aug 1 21:33:37 2010
@@ -40,16 +40,25 @@ public class ArchiveDeployer {
private final File directory;
private final String fileListName;
private final boolean generateFileList;
+ private final boolean stripVersion;
private final List<String> files = new ArrayList<String>();
- public ArchiveDeployer(File repositoryDirectory, String directory, String
fileListName, boolean generateFileList) {
+ public ArchiveDeployer(File repositoryDirectory, String directory, String
fileListName, boolean generateFileList, boolean stripVersion) {
this.directory = new File(repositoryDirectory, directory);
this.fileListName = fileListName;
this.generateFileList = generateFileList;
+ this.stripVersion = stripVersion;
}
public void deploy(Log log, Artifact artifact) throws
MojoExecutionException {
- String destFileName = artifact.getArtifactId() + "-" +
artifact.getVersion() + "." + artifact.getType();
+ StringBuilder buffer = new StringBuilder(artifact.getArtifactId());
+ if (!stripVersion) {
+ buffer.append("-");
+ buffer.append(artifact.getVersion());
+ }
+ buffer.append(".");
+ buffer.append(artifact.getType());
+ String destFileName = buffer.toString();
log.info("Adding " + destFileName);
try {
FileUtils.copyFile(artifact.getFile(), new File(directory,
destFileName));
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java?rev=981324&r1=981323&r2=981324&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
Sun Aug 1 21:33:37 2010
@@ -24,10 +24,11 @@ import java.io.File;
import org.apache.maven.artifact.Artifact;
/**
- * Creates an Axis2 repository from the project's runtime dependencies.
+ * Creates an Axis2 repository from the project's runtime dependencies. This
goal is typically
+ * used to build an Axis2 repository that will be packaged into some kind of
distribution.
*
* @goal create-repository
- * @phase generate-resources
+ * @phase package
* @requiresDependencyResolution runtime
*/
public class CreateRepositoryMojo extends AbstractCreateRepositoryMojo {
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java?rev=981324&r1=981323&r2=981324&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
Sun Aug 1 21:33:37 2010
@@ -26,7 +26,8 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
/**
- * Creates an Axis2 repository from the project's dependencies in scope test.
Note that this goal
+ * Creates an Axis2 repository from the project's dependencies in scope test.
This goal is
+ * typically used to build an Axis2 repository for use during unit tests. Note
that this goal
* is skipped if the <code>maven.test.skip</code> property is set to
<code>true</code>.
*
* @goal create-test-repository
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:33:37 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
