Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make ognl optional

Browse Source
This commit is contained in:
Keith Donald
2008-03-08 06:04:25 +00:00
parent 575ddf878c
commit c583486629
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-binding/.classpath
View File

@@ -6,12 +6,12 @@
<classpathentry kind="lib" path="lib/test/easymock.jar"/>
<classpathentry kind="lib" path="lib/test/junit.jar"/>
<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
<classpathentry kind="lib" path="lib/test/log4j.jar"/>
<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
<classpathentry kind="lib" path="lib/buildtime/ognl.jar"/>
<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="/spring"/>
<classpathentry kind="lib" path="lib/global/ognl.jar"/>
<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

2
spring-binding/ivy.xml
View File

@@ -12,12 +12,12 @@
<dependencies defaultconf="global->default">
<!-- global dependencies -->
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
<dependency org="ognl" name="ognl" rev="2.6.9" />
<dependency org="org.springframework" name="spring-beans" rev="2.5.2" />
<dependency org="org.springframework" name="spring-context" rev="2.5.2" />
<dependency org="org.springframework" name="spring-core" rev="2.5.2" />
<!-- build time only dependencies -->
<dependency org="ognl" name="ognl" rev="2.6.9" conf="buildtime->default"/>
<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default"/>
<!-- test dependencies -->

2
spring-binding/pom.xml
View File

@@ -41,7 +41,7 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<!-- Spring Dependencies -->
<dependency>

1
spring-faces/.classpath
View File

@@ -6,7 +6,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/spring-webflow"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/global/ognl.jar"/>
<classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
<classpathentry kind="lib" path="lib/global/spring-core.jar"/>

2
spring-webflow/.classpath
View File

@@ -24,7 +24,7 @@
<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
<classpathentry kind="lib" path="lib/buildtime/jta.jar"/>
<classpathentry kind="lib" path="lib/buildtime/junit.jar"/>
<classpathentry kind="lib" path="lib/global/ognl.jar"/>
<classpathentry kind="lib" path="lib/buildtime/ognl.jar"/>
<classpathentry kind="lib" path="lib/test/openjpa.jar"/>
<classpathentry kind="lib" path="lib/buildtime/persistence-api.jar"/>
<classpathentry kind="lib" path="lib/buildtime/portlet-api.jar"/>

6
spring-webflow/ivy.xml
View File

@@ -19,7 +19,6 @@
<dependencies defaultconf="global->default">
<!-- global (core) dependencies -->
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" />
<dependency org="ognl" name="ognl" rev="2.6.9" />
<!-- Xerces and XML-apis are required only under JDK 1.4 for XSD support -->
<!-- Note: POMs are incorrect in m2 repo; ignoring since they are optional anyway
<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
@@ -30,8 +29,7 @@
<dependency org="org.springframework" name="spring-core" rev="2.5.2" />
<dependency org="org.springframework" name="spring-context" rev="2.5.2" />
<dependency org="org.springframework" name="spring-web" rev="2.5.2" />
<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" conf="buildtime, mvc->default" />
<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" conf="buildtime, portlet->default" />
<dependency org="org.springframework" name="spring-webmvc" rev="2.5.2" />
<!-- testing support only dependencies -->
<dependency org="junit" name="junit" rev="3.8.2" conf="buildtime, testing->default" />
@@ -40,7 +38,9 @@
<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
<dependency org="javax.portlet" name="portlet-api" rev="1.0" conf="buildtime->default" />
<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
<dependency org="ognl" name="ognl" rev="2.6.9" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-orm" rev="2.5.2" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-webmvc-portlet" rev="2.5.2" conf="buildtime, portlet->default" />
<dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="buildtime->default" />
<dependency org="org.springframework.security" name="spring-security-core" rev="2.0-M2" conf="buildtime->default" />
<dependency org="javax.persistence" name="persistence-api" rev="1.0b" conf="buildtime->default" />

9
spring-webflow/pom.xml
View File

@@ -37,6 +37,12 @@
<version>1.3.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -48,7 +54,7 @@
<artifactId>portlet-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -65,6 +71,7 @@
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>2.6.9</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>