Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
2  build.xml
@@ -2,7 +2,7 @@
<property name="app.name" value="mViewer" />
- <property name="app.version" value="0.9" />
+ <property name="app.version" value="0.9.1" />
<property name="app.war" value="${app.name}.war" />
<property name="app.jar" value="${app.name}.jar" />
<property name="src.dir" value="${basedir}/src" />
View
61 mViewer.iml
@@ -18,67 +18,42 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target/archive-tmp" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/target/generated-test-sources" />
- <excludeFolder url="file://$MODULE_DIR$/target/mViewer-0.81" />
- <excludeFolder url="file://$MODULE_DIR$/target/mViewer-0.9" />
+ <excludeFolder url="file://$MODULE_DIR$/target/mViewer-0.9.1" />
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
- <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
- <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
- <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.7.3" level="project" />
<orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.6" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.5.6" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
- <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
- <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:3.1.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.1.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:3.1.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.1.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:3.1.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.1.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.1.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.12" level="project" />
- <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.12" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:2.5.6" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-mock:1.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-web:2.5.6" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:2.5.6" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:2.5.6" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.8" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.8" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
- <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.12" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
- <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.2" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.2" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.2" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.2" level="project" />
- <orderEntry type="library" name="Maven: com.sun.jersey:jersey-bundle:1.12" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.jersey:jersey-bundle:1.8" level="project" />
<orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-multipart:1.12" level="project" />
- <orderEntry type="library" name="Maven: org.jvnet:mimepull:1.6" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-multipart:1.8" level="project" />
+ <orderEntry type="library" name="Maven: org.jvnet:mimepull:1.4" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.winstone:winstone:0.9.10" level="project" />
</component>
View
64 pom.xml
@@ -3,8 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.imaginea</groupId>
<artifactId>mViewer</artifactId>
- <version>0.9</version>
+ <version>0.9.1</version>
<packaging>war</packaging>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
<build>
<plugins>
<plugin>
@@ -101,81 +105,67 @@
<version>1.2.16</version>
<type>jar</type>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<type>jar</type>
- <scope>compile</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.1.1.RELEASE</version>
+ <version>2.5.6</version>
<type>jar</type>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <version>1.2</version>
<type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.1.1.RELEASE</version>
+ <version>2.5.6</version>
<type>jar</type>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <version>1.0.1.Final</version>
- <type>jar</type>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <type>jar</type>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.12</version>
+ <version>1.8</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.12</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>1.12</version>
+ <version>1.8</version>
<type>jar</type>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.12</version>
+ <version>1.8</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
- <version>1.12</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>asm</groupId>
View
6 src/main/js/queryExecutor.js
@@ -47,8 +47,10 @@ YUI.add('query-executor', function (Y) {
success: function(ioId, responseObject) {
var parsedResponse = Y.JSON.parse(responseObject.responseText);
var keys = parsedResponse.response.result.keys;
- var innerHTML = formatKeys(keys);
- Y.one('#fields').set('innerHTML', innerHTML);
+ if (keys !== undefined) {
+ var innerHTML = formatKeys(keys);
+ Y.one('#fields').set('innerHTML', innerHTML);
+ }
},
failure: function(ioId, responseObject) {
MV.hideLoadingPanel();
View
2  src/main/resources/assembly.xml
@@ -24,6 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
<directory>${project.basedir}/scripts</directory>
<outputDirectory>/</outputDirectory>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
<includes>
<include>*</include>
</includes>
@@ -31,6 +32,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
<fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
+ <lineEnding>unix</lineEnding>
<includes>
<include>README*</include>
<include>LICENSE*</include>

No commit comments for this range

Something went wrong with that request. Please try again.