Merge pull request #797 from paulhoadley/duplicate-erjavamail-fix

Removes duplicate ERJavaMail framework
wocommunity · Sep 8, 2016 · 298da91 · 298da91
2 parents 279345a + 60bd322
commit 298da91
Show file tree

Hide file tree

Showing 49 changed files with 1 addition and 5,740 deletions.
diff --git a/Build/build/build.xml b/Build/build/build.xml
@@ -240,7 +240,7 @@
 
     <target name="ERJavaMail.all">
         <antcall target="global.framework.${build.action}">
-            <param name="project.dir" value="Frameworks/Mail/ERJavaMail" />
+            <param name="project.dir" value="Frameworks/Core/ERJavaMail" />
             <param name="wo.external.root.bundles" value="${frameworks.wonder.core}" />
        </antcall>
     </target>

diff --git a/Frameworks/Mail/ERJavaMail/.WOLips b/Frameworks/Mail/ERJavaMail/.WOLips
diff --git a/Frameworks/Mail/ERJavaMail/.classpath b/Frameworks/Mail/ERJavaMail/.classpath
diff --git a/Frameworks/Mail/ERJavaMail/.gitignore b/Frameworks/Mail/ERJavaMail/.gitignore
diff --git a/Frameworks/Mail/ERJavaMail/.project b/Frameworks/Mail/ERJavaMail/.project
diff --git a/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.core.resources.prefs b/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.core.resources.prefs
diff --git a/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.core.runtime.prefs b/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.core.runtime.prefs
diff --git a/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.jdt.core.prefs b/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.jdt.core.prefs
diff --git a/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.jdt.ui.prefs b/Frameworks/Mail/ERJavaMail/.settings/org.eclipse.jdt.ui.prefs
diff --git a/Frameworks/Mail/ERJavaMail/Libraries/activation-1.1.1.jar b/Frameworks/Mail/ERJavaMail/Libraries/activation-1.1.1.jar
diff --git a/Frameworks/Mail/ERJavaMail/Libraries/dsn-1.5.4.jar b/Frameworks/Mail/ERJavaMail/Libraries/dsn-1.5.4.jar
diff --git a/Frameworks/Mail/ERJavaMail/Libraries/javax.mail-1.5.4.jar b/Frameworks/Mail/ERJavaMail/Libraries/javax.mail-1.5.4.jar
diff --git a/Frameworks/Mail/ERJavaMail/Libraries/mockmail.jar b/Frameworks/Mail/ERJavaMail/Libraries/mockmail.jar
diff --git a/Frameworks/Mail/ERJavaMail/LibraryJavadocs/dsn-1.5.4-javadoc.jar b/Frameworks/Mail/ERJavaMail/LibraryJavadocs/dsn-1.5.4-javadoc.jar
diff --git a/Frameworks/Mail/ERJavaMail/LibraryJavadocs/javax.mail-1.5.4-javadoc.jar b/Frameworks/Mail/ERJavaMail/LibraryJavadocs/javax.mail-1.5.4-javadoc.jar
diff --git a/Frameworks/Mail/ERJavaMail/LibrarySources/dsn-1.5.4-sources.jar b/Frameworks/Mail/ERJavaMail/LibrarySources/dsn-1.5.4-sources.jar
diff --git a/Frameworks/Mail/ERJavaMail/LibrarySources/javax.mail-1.5.4-sources.jar b/Frameworks/Mail/ERJavaMail/LibrarySources/javax.mail-1.5.4-sources.jar
diff --git a/Frameworks/Mail/ERJavaMail/Resources/Properties b/Frameworks/Mail/ERJavaMail/Resources/Properties
diff --git a/Frameworks/Mail/ERJavaMail/Resources/_Properties_ja b/Frameworks/Mail/ERJavaMail/Resources/_Properties_ja