Author: ruwan
Date: Sun Apr 26 20:31:08 2009
New Revision: 768767
URL: http://svn.apache.org/viewvc?rev=768767&view=rev
Log:
log4j.properties and *.jks files actually belongs to the disstribution source.
(n2n test as well should be moved to the distribution)
-- this also excludes the log4j.properties file from the synapse-core.jar
Added:
synapse/trunk/java/modules/distribution/src/main/conf/
synapse/trunk/java/modules/distribution/src/main/conf/identity.jks (props
changed)
- copied unchanged from r768469,
synapse/trunk/java/modules/core/src/main/resources/identity.jks
synapse/trunk/java/modules/distribution/src/main/conf/log4j.properties
(props changed)
- copied unchanged from r768469,
synapse/trunk/java/modules/core/src/main/resources/log4j.properties
synapse/trunk/java/modules/distribution/src/main/conf/providers.xml
- copied unchanged from r768469,
synapse/trunk/java/modules/core/src/main/resources/providers.xml
synapse/trunk/java/modules/distribution/src/main/conf/trust.jks (props
changed)
- copied unchanged from r768469,
synapse/trunk/java/modules/core/src/main/resources/trust.jks
Removed:
synapse/trunk/java/modules/core/src/main/resources/identity.jks
synapse/trunk/java/modules/core/src/main/resources/log4j.properties
synapse/trunk/java/modules/core/src/main/resources/providers.xml
synapse/trunk/java/modules/core/src/main/resources/trust.jks
Modified:
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
Modified: synapse/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=768767&r1=768766&r2=768767&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Sun Apr 26 20:31:08 2009
@@ -193,9 +193,6 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.jks</exclude>
- </excludes>
</resource>
</resources>
</build>
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?rev=768767&r1=768766&r2=768767&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
Sun Apr 26 20:31:08 2009
@@ -64,7 +64,7 @@
findAndReplace(
new File("./../../repository/conf/axis2.xml"),
new File("./target/test_repos/axis2.xml"),
- "lib/", "src/main/resources/");
+ "lib/", "./../../modules/distribution/src/main/conf/");
System.setProperty("jmx.agent.name", "synapse");
ConfigurationContext synapseConfigCtx = ConfigurationContextFactory
Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=768767&r1=768766&r2=768767&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Sun Apr
26 20:31:08 2009
@@ -82,7 +82,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>../../modules/core/src/main/resources</directory>
+ <directory>../../modules/distribution/src/main/conf</directory>
<outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
<includes>
<include>log4j.properties</include>
Propchange: synapse/trunk/java/modules/distribution/src/main/conf/identity.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange:
synapse/trunk/java/modules/distribution/src/main/conf/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: synapse/trunk/java/modules/distribution/src/main/conf/trust.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
