Skip to content

Commit

Permalink
using Ivy for dependency management
Browse files Browse the repository at this point in the history
  • Loading branch information
Marlon Richert committed Jan 13, 2012
1 parent a71615a commit e0daff1
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 22 deletions.
1 change: 1 addition & 0 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bworkspace_loc%3AGraph-Explorer%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
2 changes: 0 additions & 2 deletions .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
5 changes: 3 additions & 2 deletions .settings/com.vaadin.integration.eclipse.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#Fri Jan 13 09:50:27 EET 2012
#Fri Jan 13 15:27:51 EET 2012
com.vaadin.integration.eclipse.useLatestNightly=false
com.vaadin.integration.eclipse.widgetsetDirty=true
com.vaadin.integration.eclipse.widgetsetCompilationEta=75284
com.vaadin.integration.eclipse.widgetsetDirty=false
eclipse.preferences.version=1
4 changes: 4 additions & 0 deletions WebContent/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Manifest-Version: 1.0
Implementation-Title: Graph-Explorer
Implementation-Version: 0.2.0
Vaadin-Package-Version: 1
Vaadin-Widgetsets: com.vaadin.graph.GraphExplorerWidgetset
Class-Path:

1 change: 1 addition & 0 deletions WebContent/VAADIN/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/widgetsets
Binary file removed WebContent/WEB-INF/lib/collections-generic-4.01.jar
Binary file not shown.
Binary file removed WebContent/WEB-INF/lib/gwt-graphics-1.0.0.jar
Binary file not shown.
Binary file removed WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar
Binary file not shown.
Binary file removed WebContent/WEB-INF/lib/jung-algorithms-2.0.1.jar
Binary file not shown.
Binary file removed WebContent/WEB-INF/lib/jung-api-2.0.1.jar
Binary file not shown.
Binary file removed WebContent/WEB-INF/lib/jung-graph-impl-2.0.1.jar
Binary file not shown.
Binary file removed WebContent/WEB-INF/lib/jung-visualization-2.0.1.jar
Binary file not shown.
Binary file removed WebContent/WEB-INF/lib/vaadin-6.7.4.jar
Binary file not shown.
18 changes: 0 additions & 18 deletions WebContent/WEB-INF/web.xml

This file was deleted.

23 changes: 23 additions & 0 deletions ivy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<ivy-module
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:m="http://ant.apache.org/ivy/maven"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info
organisation="com.vaadin"
module="graph-explorer"
status="integration">
</info>
<dependencies>
<dependency org="com.vaadin" name="vaadin" rev="6.7.4" />
<dependency org="net.sf.jung" name="jung-api" rev="2.0.1" />
<dependency org="net.sf.jung" name="jung-graph-impl" rev="2.0.1" />
<dependency org="net.sf.jung" name="jung-algorithms" rev="2.0.1" />
<dependency org="net.sf.jung" name="jung-visualization" rev="2.0.1" />
<dependency org="net.sf.json-lib" name="json-lib" rev="2.4">
<artifact name="json-lib" type="jar" m:classifier="jdk15"/>
</dependency>
<dependency org="org.vaadin.addons" name="gwt-graphics" rev="1.0.0"/>
</dependencies>
</ivy-module>
13 changes: 13 additions & 0 deletions ivysettings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<ivysettings>
<settings defaultResolver="default-chain" />
<resolvers>
<chain name="default-chain">
<url name="vaadin-addons" m2compatible="true">
<artifact
pattern="http://maven.vaadin.com/vaadin-addons/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
</url>
<ibiblio name="public" m2compatible="true"/>
</chain>
</resolvers>
</ivysettings>
File renamed without changes.

0 comments on commit e0daff1

Please sign in to comment.