Author: enridaga
Date: Sun Oct 20 19:09:51 2013
New Revision: 1533952
URL: http://svn.apache.org/r1533952
Log:
STANBOL-1152 Pom cleanup, added template (forgot in previous commit), minor
fixes to template references in resource
Added:
stanbol/branches/commons-ng/ontologymanager/web/src/main/resources/templates/html/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource/conflict.ftl
Modified:
stanbol/branches/commons-ng/ontologymanager/web/pom.xml
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
Modified: stanbol/branches/commons-ng/ontologymanager/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/pom.xml?rev=1533952&r1=1533951&r2=1533952&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/pom.xml Sun Oct 20 19:09:51
2013
@@ -55,18 +55,17 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <instructions>
+ <instructions><!-- com.sun.jersey.*; version="[1.15.0,2)", -->
<Import-Package>
javax.ws.rs.*; version="[2.0,3]",
org.apache.stanbol.commons.web.base; provide:=true;
version="[1.0.0,2)",
org.apache.clerezza.jaxrs.utils.*,
- com.sun.jersey.*; version="[1.15.0,2)",
com.sun.net.httpserver.*,
*
</Import-Package>
<Export-Package>
- org.objectweb.asm.*, com.sun.jersey.*, org.jvnet.mimepull.*,
sun.*, com.sun.*, com.sun.net.httpserver.*
- </Export-Package>
+ org.objectweb.asm.*, org.jvnet.mimepull.*, sun.*, com.sun.*,
com.sun.net.httpserver.*
+ </Export-Package> <!-- com.sun.jersey.*, -->
<Private-Package>
org.apache.stanbol.ontologymanager.web;
version=${project.version},
org.apache.stanbol.ontologymanager.web.resources;
version=${project.version},
Modified:
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java?rev=1533952&r1=1533951&r2=1533952&view=diff
==============================================================================
---
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
(original)
+++
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
Sun Oct 20 19:09:51 2013
@@ -692,7 +692,7 @@ public class OntoNetRootResource extends
rb = Response.status(Status.CONFLICT);
this.submitted = guessed;
if
(headers.getAcceptableMediaTypes().contains(MediaType.TEXT_HTML_TYPE)) {
- rb.entity(new Viewable("/imports/409", this));
+ rb.entity(new Viewable("/imports/409.ftl", this));
rb.header(HttpHeaders.CONTENT_TYPE,
MediaType.TEXT_HTML + "; charset=utf-8");
}
break;
Added:
stanbol/branches/commons-ng/ontologymanager/web/src/main/resources/templates/html/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource/conflict.ftl
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/resources/templates/html/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource/conflict.ftl?rev=1533952&view=auto
==============================================================================
---
stanbol/branches/commons-ng/ontologymanager/web/src/main/resources/templates/html/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource/conflict.ftl
(added)
+++
stanbol/branches/commons-ng/ontologymanager/web/src/main/resources/templates/html/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource/conflict.ftl
Sun Oct 20 19:09:51 2013
@@ -0,0 +1,17 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<#include "/imports/409.ftl">
\ No newline at end of file
