Permalink
Browse files

dependency cleanup

  • Loading branch information...
1 parent 3005488 commit 7937a3cb1ba5f728a7a8885945cb02c62f6d9f73 @pulse00 committed Apr 2, 2013
Showing with 233 additions and 168 deletions.
  1. +5 −17 .gitignore
  2. +2 −3 com.dubture.symfony.annotation/.classpath
  3. +2 −1 com.dubture.symfony.annotation/.gitignore
  4. +6 −0 com.dubture.symfony.annotation/.project
  5. +3 −6 com.dubture.symfony.annotation/META-INF/MANIFEST.MF
  6. +1 −4 com.dubture.symfony.annotation/build.properties
  7. BIN com.dubture.symfony.annotation/lib/antlr-runtime-3.3.jar
  8. +10 −9 com.dubture.symfony.annotation/pom.xml
  9. +2 −10 com.dubture.symfony.core/.classpath
  10. +6 −0 com.dubture.symfony.core/.project
  11. +15 −8 com.dubture.symfony.core/META-INF/MANIFEST.MF
  12. BIN com.dubture.symfony.core/Resources/commons-compress-1.3-javadoc.jar
  13. BIN com.dubture.symfony.core/Resources/commons-compress-1.3-sources.jar
  14. BIN com.dubture.symfony.core/Resources/commons-io-2.2-javadoc.jar
  15. BIN com.dubture.symfony.core/Resources/commons-io-2.2-sources.jar
  16. BIN com.dubture.symfony.core/Resources/snakeyaml-1.10-sources.jar
  17. +1 −7 com.dubture.symfony.core/build.properties
  18. BIN com.dubture.symfony.core/lib/commons-compress-1.3.jar
  19. BIN com.dubture.symfony.core/lib/commons-io-2.2.jar
  20. BIN com.dubture.symfony.core/lib/json_simple-1.1.jar
  21. BIN com.dubture.symfony.core/lib/snakeyaml-1.10.jar
  22. +13 −12 com.dubture.symfony.core/pom.xml
  23. +2 −2 com.dubture.symfony.debug/.classpath
  24. +6 −0 com.dubture.symfony.debug/.project
  25. +3 −1 com.dubture.symfony.debug/META-INF/MANIFEST.MF
  26. +10 −9 com.dubture.symfony.debug/pom.xml
  27. +6 −0 com.dubture.symfony.feature/.project
  28. +28 −0 com.dubture.symfony.feature/feature.xml
  29. +2 −2 com.dubture.symfony.index/.classpath
  30. +6 −0 com.dubture.symfony.index/.project
  31. +2 −3 com.dubture.symfony.test/.classpath
  32. +6 −0 com.dubture.symfony.test/.project
  33. +52 −51 com.dubture.symfony.test/pom.xml
  34. +2 −2 com.dubture.symfony.twig/.classpath
  35. +6 −0 com.dubture.symfony.twig/.project
  36. +10 −9 com.dubture.symfony.twig/pom.xml
  37. +2 −2 com.dubture.symfony.ui/.classpath
  38. +6 −0 com.dubture.symfony.ui/.project
  39. +2 −1 com.dubture.symfony.ui/META-INF/MANIFEST.MF
  40. +10 −9 com.dubture.symfony.ui/pom.xml
  41. +6 −0 pom.xml
View
@@ -1,19 +1,7 @@
.DS_Store
-com.dubture.symfony.annotation/bin/*
-com.dubture.symfony.core/bin/*
-com.dubture.symfony.ui/bin/*
-com.dubture.symfony.twig/bin/*
-com.dubture.symfony.test/bin/*
-com.dubture.symfony.index/bin/*
-com.dubture.symfony.debug/bin/*
-
-com.dubture.symfony.annotation/target/*
-com.dubture.symfony.core/target/*
-com.dubture.symfony.ui/target/*
-com.dubture.symfony.twig/target/*
-com.dubture.symfony.test/target/*
-com.dubture.symfony.index/target/*
-com.dubture.symfony.debug/target/*
-com.dubture.symfony.feature/target/*
-
+target/
+bin/
+.project
+.settings/
+.classpath
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1 +1,2 @@
-Resources/*.tokens
+Resources/*.tokens
+/target
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
@@ -6,17 +6,14 @@ Bundle-Version: 1.0.92.qualifier
Bundle-Activator: com.dubture.symfony.annotation.SymfonyAnnotationPlugin
Bundle-Vendor: https://github.com/pulse00
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.dltk.core
+ org.eclipse.dltk.core,
+ org.antlr.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: com.dubture.symfony.annotation,
com.dubture.symfony.annotation.model,
com.dubture.symfony.annotation.parser,
com.dubture.symfony.annotation.parser.antlr,
com.dubture.symfony.annotation.parser.antlr.error,
com.dubture.symfony.annotation.parser.tree,
- com.dubture.symfony.annotation.parser.tree.visitor,
- org.antlr.runtime,
- org.antlr.runtime.tree
-Bundle-ClassPath: .,
- lib/antlr-runtime-3.3.jar
+ com.dubture.symfony.annotation.parser.tree.visitor
Bundle-ActivationPolicy: lazy
@@ -1,5 +1,2 @@
-source.. = src/
output.. = bin/
-bin.includes = META-INF/,\
- .,\
- lib/antlr-runtime-3.3.jar
+bin.includes = META-INF/
Binary file not shown.
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.dubture.symfony</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.92-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>com.dubture.symfony</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.92-SNAPSHOT</version>
+ </parent>
- <artifactId>com.dubture.symfony.annotation</artifactId>
- <packaging>eclipse-plugin</packaging>
+ <artifactId>com.dubture.symfony.annotation</artifactId>
+ <packaging>eclipse-plugin</packaging>
</project>
@@ -1,15 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/commons-io-2.2.jar" sourcepath="Resources/commons-io-2.2-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-compress-1.3.jar" sourcepath="Resources/commons-compress-1.3-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:platform:/resource/com.dubture.symfony.core/Resources/commons-compress-1.3-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="lib" path="lib/json_simple-1.1.jar"/>
- <classpathentry kind="lib" path="lib/snakeyaml-1.10.jar" sourcepath="Resources/snakeyaml-1.10-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
@@ -18,7 +18,12 @@ Require-Bundle: org.eclipse.core.runtime,
com.dubture.doctrine.core,
org.eclipse.wst.validation,
org.eclipse.wst.xml.core,
- org.eclipse.wst.common.uriresolver
+ org.eclipse.wst.common.uriresolver,
+ org.antlr.runtime,
+ org.apache.commons.compress,
+ org.apache.commons.io,
+ org.json.simple,
+ org.yaml.snakeyaml
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.dubture.symfony.core,
@@ -27,19 +32,21 @@ Export-Package: com.dubture.symfony.core,
com.dubture.symfony.core.codeassist.contexts,
com.dubture.symfony.core.codeassist.strategies,
com.dubture.symfony.core.compiler,
+ com.dubture.symfony.core.event,
+ com.dubture.symfony.core.goals,
+ com.dubture.symfony.core.goals.evaluator,
com.dubture.symfony.core.index,
+ com.dubture.symfony.core.index.visitor,
com.dubture.symfony.core.log,
com.dubture.symfony.core.model,
+ com.dubture.symfony.core.model.exception,
com.dubture.symfony.core.model.listener,
+ com.dubture.symfony.core.parser,
com.dubture.symfony.core.parser.antlr.error,
com.dubture.symfony.core.preferences,
com.dubture.symfony.core.resources,
com.dubture.symfony.core.util,
com.dubture.symfony.core.util.text,
- org.json.simple,
- org.json.simple.parser
-Bundle-ClassPath: .,
- lib/json_simple-1.1.jar,
- lib/commons-compress-1.3.jar,
- lib/commons-io-2.2.jar,
- lib/snakeyaml-1.10.jar
+ com.dubture.symfony.core.validation,
+ com.dubture.symfony.core.visitor,
+ com.dubture.symfony.core.yaml.exception
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,4 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
plugin.xml,\
- lib/json_simple-1.1.jar,\
- Resources/vendor/symfony2/,\
- lib/commons-compress-1.3.jar,\
- lib/commons-io-2.2.jar,\
- lib/snakeyaml-1.10.jar
+ Resources/vendor/symfony2/
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.dubture.symfony</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.92-SNAPSHOT</version>
-
- </parent>
-
- <artifactId>com.dubture.symfony.core</artifactId>
- <packaging>eclipse-plugin</packaging>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.dubture.symfony</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.92-SNAPSHOT</version>
+
+ </parent>
+
+ <artifactId>com.dubture.symfony.core</artifactId>
+ <packaging>eclipse-plugin</packaging>
</project>
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
@@ -27,6 +27,8 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.dubture.symfony.debug,
- com.dubture.symfony.debug.launch
+ com.dubture.symfony.debug.launch,
+ com.dubture.symfony.debug.server,
+ com.dubture.symfony.debug.util
Bundle-ClassPath: .
Eclipse-RegisterBuddy: org.eclipse.php.debug.core
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.dubture.symfony</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.92-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>com.dubture.symfony</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.92-SNAPSHOT</version>
+ </parent>
- <artifactId>com.dubture.symfony.debug</artifactId>
- <packaging>eclipse-plugin</packaging>
+ <artifactId>com.dubture.symfony.debug</artifactId>
+ <packaging>eclipse-plugin</packaging>
</project>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
@@ -79,4 +79,32 @@ THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRES
version="1.0.92.qualifier"
unpack="false"/>
+ <plugin
+ id="org.apache.commons.io"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.compress"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.yaml.snakeyaml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.json.simple"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="/com.dubture.symfony.annotation/lib/antlr-runtime-3.3.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
Oops, something went wrong.

0 comments on commit 7937a3c

Please sign in to comment.