Permalink
Browse files

final release version. Fix minor javadocs

svn path=/trunk/; revision=275
  • Loading branch information...
Kin Man Chung
Kin Man Chung committed Apr 25, 2013
1 parent b2db7b8 commit 7f42324190c9871c0eb774ad28faab028a001f13
@@ -52,13 +52,13 @@
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<packaging>jar</packaging>
<version>3.0-b09-SNAPSHOT</version>
<version>3.0.0</version>
<name>Expression Language 3.0 API</name>

<properties>
<!-- Make sure the two versions are in sync with the maven version -->
<spec.version>2.2.99.08</spec.version>
<bundle.version>2.2.99.b08</bundle.version>
<spec.version>3.0</spec.version>
<bundle.version>3.0.0</bundle.version>
<extensionName>javax.el</extensionName>
<bundle.symbolicName>javax.el-api</bundle.symbolicName>
<vendorName>Oracle Corporation</vendorName>
@@ -100,7 +100,6 @@
<developer>
<id>kchung</id>
<name>Kin Man Chung</name>
<url>http://blogs.sun.com/kchung/</url>
<organization>Oracle Corporation</organization>
<roles>
<role>lead</role>
@@ -140,7 +140,7 @@ public void setVariable(String variable, ValueExpression expression) {
/**
* Import a static field or method. The class of the static member must be
* loadable from the classloader, at class resolution time.
* @param className The full class name of the class to be imported
* @param staticMemberName The full class name of the class to be imported
* @throws ELException if the name is not a full class name.
*/
public void importStatic(String staticMemberName) throws ELException {
@@ -234,7 +234,7 @@ public MethodInfo getMethodInfo(ELContext context)
}

/**
* @return
* @return The Node for the expression
* @throws ELException
*/
private Node getNode() throws ELException {
@@ -179,7 +179,7 @@ public String getExpressionString() {
}

/**
* @return
* @return The Node for the expression
* @throws ELException
*/
private Node getNode() throws ELException {
@@ -74,9 +74,9 @@ public final static void throwUnhandled(Object base, Object property)
}

/**
* @param obj0
* @param obj1
* @return
* @param obj0 First object to be compared
* @param obj1 Second object to be compared
* @return The result (an int with values -1, 0, or 1) of the comparison
* @throws EvaluationException
*/
public final static int compare(final Object obj0, final Object obj1)
@@ -123,9 +123,9 @@ public final static int compare(final Object obj0, final Object obj1)
}

/**
* @param obj0
* @param obj1
* @return
* @param obj0 Fisrt object to be compared
* @param obj1 Second object to be compared
* @return true if the objects compared equal
* @throws EvaluationException
*/
public final static boolean equals(final Object obj0, final Object obj1)
@@ -173,8 +173,8 @@ public final static boolean equals(final Object obj0, final Object obj1)
}

/**
* @param obj
* @return
* @param obj Object to be coerced
* @return The result of coercion
*/
public final static Boolean coerceToBoolean(final Object obj)
throws IllegalArgumentException {
@@ -343,8 +343,8 @@ protected final static Number coerceToNumber(final String val,
}

/**
* @param obj
* @return
* @param obj Object to be coerced
* @return The result of coercion
*/
public final static String coerceToString(final Object obj) {
if (obj == null) {
@@ -419,8 +419,8 @@ public final static Object coerceToType(final Object obj, final Class<?> type)
}

/**
* @param obj
* @return
* @param obj An array of objects
* @return true if the array contains a null, false otherwise
*/
public final static boolean containsNulls(final Object[] obj) {
for (int i = 0; i < obj.length; i++) {
@@ -109,7 +109,7 @@ protected static Class forNamePrimitive(String name) {
/**
* Converts an array of Class names to Class types
* @param s
* @return
* @return The array of Classes
* @throws ClassNotFoundException
*/
public static Class[] toTypeArray(String[] s) throws ClassNotFoundException {
@@ -125,7 +125,7 @@ protected static Class forNamePrimitive(String name) {
/**
* Converts an array of Class types to Class names
* @param c
* @return
* @return The array of Classes
*/
public static String[] toTypeNameArray(Class[] c) {
if (c == null)
@@ -218,9 +218,9 @@ protected static final String paramString(Class[] types) {
}

/**
* @param base
* @param property
* @return
* @param base The base object
* @param property The property
* @return The PropertyDescriptor for the base with the given property
* @throws ELException
* @throws PropertyNotFoundException
*/
71 pom.xml
@@ -51,21 +51,22 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0-b08-SNAPSHOT</version>
<version>3.0.0</version>
<packaging>jar</packaging>
<name>Expression Language 3.0</name>

<properties>
<!-- the bundle build number must be the same as the maven number -->
<bundle.version>2.2.99.b07</bundle.version>
<bundle.version>3.0.0</bundle.version>
<!-- The most current api version -->
<spec.version>2.2.99.08</spec.version>
<spec.version>3.0</spec.version>
<extensionName>javax.el</extensionName>
<bundle.symbolicName>org.glassfish.javax.el</bundle.symbolicName>
<bundle.symbolicName>com.sun.el.javax.el</bundle.symbolicName>
<vendorName>Oracle Corporation</vendorName>
<findbugs.version>2.3.1</findbugs.version>
<findbugs.exclude />
<findbugs.threshold>High</findbugs.threshold>
<tlda-license.url>http://hudson-sca.us.oracle.com/job/tlda-license/lastSuccessfulBuild/artifact</tlda-license.url>
</properties>

<url>http://el-spec.java.net</url>
@@ -101,8 +102,7 @@
<developer>
<id>kchung</id>
<name>Kin-man Chung</name>
<url>http://blogs.sun.com/kchung/</url>
<organization>Sun Microsystems, Inc.</organization>
<organization>Oracle</organization>
<roles>
<role>lead</role>
</roles>
@@ -168,6 +168,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -187,7 +188,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version> 2.1 </version>
<version> 2.2.1 </version>
<configuration>
<includePom>true</includePom>
</configuration>
@@ -203,6 +204,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -349,4 +351,59 @@
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>licensee</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0-beta-4</version>
<inherited>false</inherited>
<executions>
<execution>
<id>get-license</id>
<phase>package</phase>
<goals>
<goal>download-single</goal>
</goals>
<configuration>
<url>${tlda-license.url}</url>
<fromFile>
TLDA_SCSL_Licensees_License_Notice.txt
</fromFile>
<toDir>${project.build.directory}/license</toDir>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<inherited>false</inherited>
<executions>
<execution>
<id>make-licensee-src-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>el-${project.version}-src</finalName>
<attach>false</attach>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
@@ -0,0 +1,27 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

<id>el-sources</id>
<formats>
<format>zip</format>
</formats>

<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>spec/**</exclude>
<exclude>fonts/**</exclude>
<exclude>target/**</exclude>
<exclude>api/target/**</exclude>
<exclude>src/assembly/**</exclude>
</excludes>
</fileSet>
<fileSet>
<outputDirectory>/</outputDirectory>
<directory>${project.build.directory}/license</directory>
</fileSet>
</fileSets>
</assembly>
@@ -258,6 +258,9 @@ public void testMinMax() {

@Test
public void testMap() {
elp.eval("v = {'one':1, 'two':2}");
Object r = elp.eval("v = {'one':1, 'two':2}");
System.out.println(" "+ r);
r = elp.eval("{1,2,3}");
System.out.println(" "+ r);
}
}

0 comments on commit 7f42324

Please sign in to comment.