josegar74 · josegar74 · Dec 17, 2012 · Dec 5, 2012 · Dec 5, 2012 · Dec 5, 2012
diff --git a/installer b/installer
diff --git a/jeeves/src/main/java/jeeves/server/ProfileManager.java b/jeeves/src/main/java/jeeves/server/ProfileManager.java
@@ -300,15 +300,16 @@ public static boolean isAccessibleService(Object serviceName) {
 		if(serviceContext == null) return true;
 		ServletContext servletContext = serviceContext.getServlet().getServletContext();
 		WebApplicationContext springContext = WebApplicationContextUtils.getWebApplicationContext(servletContext);
-		if(springContext == null) return true;
+		SecurityContext context = SecurityContextHolder.getContext();
+		if(springContext == null || context == null) return true;
+
 		Map<String, AbstractSecurityInterceptor> evals = springContext.getBeansOfType(AbstractSecurityInterceptor.class);
+		Authentication authentication = context.getAuthentication();
+
+		FilterInvocation fi = new FilterInvocation(null, "/srv/"+serviceContext.getLanguage()+"/"+serviceName, null);
 		for(AbstractSecurityInterceptor securityInterceptor: evals.values()) {
-	    	SecurityContext context = SecurityContextHolder.getContext();
 	    	if(securityInterceptor == null || context == null) return true;
 
-			Authentication authentication = context.getAuthentication();
-
-	        FilterInvocation fi = new FilterInvocation(null, "/srv/"+serviceContext.getLanguage()+"/"+serviceName, null);
 
 	        Collection<ConfigAttribute> attrs = securityInterceptor.obtainSecurityMetadataSource().getAttributes(fi);
 
@@ -324,11 +325,13 @@ public static boolean isAccessibleService(Object serviceName) {
 	            securityInterceptor.getAccessDecisionManager().decide(authentication, fi, attrs);
 	            return true;
 	        } catch (AccessDeniedException unauthorized) {
-	            if (Log.isDebugEnabled(Log.REQUEST)) {
-	                Log.debug(Log.REQUEST, fi.toString() + " denied for " + authentication.toString(), unauthorized);
-	            }
+	        	// ignore
 	        }
 		}
+        if (Log.isDebugEnabled(Log.REQUEST)) {
+            Log.info(Log.REQUEST, fi.toString() + " denied for " + authentication.toString());
+        }
+
 		return false;
 	}
 

diff --git a/jeeves/src/main/java/jeeves/server/ScheduleJob.java b/jeeves/src/main/java/jeeves/server/ScheduleJob.java
@@ -15,7 +15,7 @@
  * 
  * @author jeichar
  */
-class ScheduleJob implements Job {
+public class ScheduleJob implements Job {
 
     public static final String NAME_FIELD_NAME = "scheduleName";
 

diff --git a/pom.xml b/pom.xml
@@ -411,6 +411,11 @@
           <artifactId>lucene-queries</artifactId>
           <version>${lucene.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-facet</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
       <dependency>
           <groupId>pcj</groupId>
           <artifactId>pcj</artifactId>
@@ -941,8 +946,8 @@
 
   <properties>
     <jetty.version>7.3.1.v20110307</jetty.version>
+    <lucene.version>3.6.1</lucene.version>
     <geotools.version>8.1</geotools.version>
-    <lucene.version>3.0.2</lucene.version>
     <spring.version>3.1.1.RELEASE</spring.version>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH'\:'mm'\:'ssZ</maven.build.timestamp.format>
     <build.timestamp>${maven.build.timestamp}</build.timestamp>

diff --git a/web-client/pom.xml b/web-client/pom.xml
@@ -58,10 +58,11 @@
         <executions>
           <execution>
             <!-- 
-                This phase does not belong to the default lifecycle for a jar/war packaging.
-                It has to be run explicitely as mvn command argument for generating obfuscated js. 
+                minified files need to be generated before resource
+                phase so they are copied to target folder.  If not in target folder
+                then they will not be copied to jar.
              -->
-            <phase>prepare-package</phase>
+            <phase>generate-resources</phase>
             <goals>
               <goal>compress</goal>
             </goals>
@@ -158,6 +159,11 @@
                 <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WMC/v1_0_0.js</include>
                 <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WMC/v1_1_0.js</include>
                 <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WKT.js</include>
+                <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/OGCExceptionReport.js</include>
+                <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WFSCapabilities.js</include>
+                <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WFSCapabilities/v1.js</include>
+                <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js</include>
+                <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js</include>
                 <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js</include>
                 <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Geometry.js</include>
                 <include>${project.build.directory}/classes/apps/js/OpenLayers/lib/OpenLayers/Control.js</include>
@@ -316,6 +322,7 @@
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/lang/pl.js</include>
 
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/Util.js</include>
+                <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/Message.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/Catalogue.js</include>
 
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/util/HelpTools.js</include>
@@ -362,6 +369,7 @@
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/widgets/Templates.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/widgets/CategoryView.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/widgets/SearchFormPanel.js</include>
+                <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/widgets/FacetsPanel.js</include>
 
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/widgets/view/ViewWindow.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/widgets/view/ViewPanel.js</include>
@@ -417,6 +425,7 @@
                 <!--//"GeoNetwork/map/widgets/PrintAction.js</include>-->
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/map/widgets/ProjectionSelector.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/map/widgets/TimeSelector.js</include>
+                <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/map/widgets/WxSExtractor.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/map/windows/BaseWindow.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/map/windows/SingletonWindowManager.js</include>
                 <include>${project.build.directory}/classes/apps/js/GeoNetwork/lib/GeoNetwork/map/windows/AddWMS.js</include>

diff --git a/web-client/src/main/resources/apps/css/gndefault.css b/web-client/src/main/resources/apps/css/gndefault.css
@@ -37,9 +37,7 @@ pre.code {
 }
 #msg-div {
   position : absolute;
-  left : 35%;
-  top : 10px;
-  width : 250px;
+  width : 350px;
   z-index : 20000;
 }
 .x-grid3-row-body p {
@@ -330,6 +328,11 @@ table.related * a:hover,
   background-repeat : no-repeat;
   padding-left : 15px;
 }
+.WFSDownloadIcon {
+  background-image : url(../images/default/database_yellow.png) !important;
+  background-repeat : no-repeat;
+  padding-left : 15px;
+}
 
 .logo-wrap div img {
   max-height : 80px;
@@ -424,6 +427,79 @@ dl.xml {
 dl.xml * dd {
   padding-left : 2px;
 }
+
+div.facets * ul,
+div.facets * li {
+    list-style: none;
+}
+/**
+ * Facet category label
+ */
+div.facets > ul > li {
+    margin: 0px;
+    padding: 0px;
+    border-top: 1px solid #CCC;
+    font-weight: bold;
+}
+/**
+ * Facet sub elements
+ */
+div.facets ul ul {
+    margin-left: 5px;
+    margin-bottom: 5px;
+    font-size: 85%;
+}
+/**
+ * Facet count between (number) displayed next to a facet value
+ */
+.facet-count {
+    color: #71C0DD;
+    padding-left: 3px;
+}
+/**
+ * Facet clickable link which trigger the filter action
+ */
+div.facets * a {
+    text-decoration: none;
+}
+div.facets * .facet-more-bt, 
+div.facets * .facet-less-bt {
+    color: #71C0DD;
+}
+.breadcrumb * .x-btn-tl, 
+.breadcrumb * .x-btn-tr, 
+.breadcrumb * .x-btn-tc, 
+.breadcrumb * .x-btn-ml, 
+.breadcrumb * .x-btn-mr, 
+.breadcrumb * .x-btn-mc, 
+.breadcrumb * .x-btn-bl, 
+.breadcrumb * .x-btn-br, 
+.breadcrumb * .x-btn-bc{
+    background: none;
+}
+.breadcrumb * button {
+    color: #0076A1;
+    font-size: smaller;
+    font-weight: bold;
+}
+.breadcrumb * button:hover {
+    color : #959532;
+    text-decoration: underline;
+}
+.breadcrumb-mn {
+    background-color: #FFF !important;
+    background-image: none;
+}
+.breadcrumb-mn * .current-mn {
+    font-weight: bold;
+}
+.breadcrumb-mn * a.x-menu-item {
+    line-height: 10px;
+}
+.breadcrumb-mn * .x-menu-item-icon {
+    height: 10px;
+    width: 10px;
+}
 .tplTitle {
     font-weight: bold;
 }

diff --git a/web-client/src/main/resources/apps/css/gnmapdefault.css b/web-client/src/main/resources/apps/css/gnmapdefault.css
@@ -223,3 +223,28 @@ div.map-overlay {
   float : left;
   margin-right : 2px;
 }
+.info-wms {
+  padding: 2px;
+  color: #069;
+}
+
+.info-wms p {
+  padding: 5px;
+}
+
+.info-wms ul {
+  width: 100%;
+}
+
+.info-wms li {
+  font-weight: bold;
+}
+.info-wms li span {
+  width: 33%;
+  padding-right: 5px;
+  font-weight: normal;
+}
+.info-wms ul li ul li {
+    list-style-type: circle;
+    margin-left: 16px;
+}
diff --git a/web-client/src/main/resources/apps/css/metadata-view.css b/web-client/src/main/resources/apps/css/metadata-view.css
@@ -59,6 +59,7 @@ table.related * li {
 .md-view * a {
   text-decoration : none;
   color : #0076A1;
+  cursor: pointer;
 }
 .md-view * a:hover {
   text-decoration : underline;
@@ -81,7 +82,6 @@ table.related * li {
 .md-view ul li {
   border-top : 1px solid transparent;
   color : #222222;
-  cursor : pointer;
   float : left;
   margin : 2px;
   overflow : hidden;

diff --git a/web-client/src/main/resources/apps/js/GeoNetwork/examples/charts-ext3-and-4.html b/web-client/src/main/resources/apps/js/GeoNetwork/examples/charts-ext3-and-4.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Make a chart of your catalogue search</title>
+   <!--  <link rel="stylesheet" type="text/css" href="../js/ext-4.0.2a/resources/css/ext-all.css" />
+    --> 
+
+    <link rel="stylesheet" type="text/css" href="../../ext/resources/css/ext-all.css" />
+    <link rel="stylesheet" type="text/css" href="http://dev.sencha.com/deploy/ext-4.1.0-gpl/examples/shared/example.css" />
+    <link rel="stylesheet" type="text/css" href="http://dev.sencha.com/deploy/ext-4.1.0-gpl/resources/css/ext-sandbox.css">
+
+    <link rel="stylesheet" type="text/css" href="../../../css/gndefault.css"/>
+    <link rel="stylesheet" type="text/css" href="../../../css/gnmapdefault.css"/>
+    <link rel="stylesheet" type="text/css" href="../../../css/gnmetadatadefault.css"/>
+    <link rel="stylesheet" type="text/css" href="../../../js/GeoNetwork/resources/css/metadata-view.css"/>
+
+
+    <script type="text/javascript" src="../../ext/adapter/ext/ext-base.js"></script>
+    <script type="text/javascript" src="../../ext/ext-all-debug.js"></script>
+
+    <script type="text/javascript" src="../../OpenLayers/lib/OpenLayers.js"></script>
+    <script type="text/javascript" src="../../GeoExt/lib/overrides/override-ext-ajax.js"></script>
+    <script type="text/javascript" src="../../GeoExt/lib/GeoExt.js"></script>
+    <script type="text/javascript" src="../../GeoNetwork/lib/GeoNetwork.js"></script>
+
+    <script type="text/javascript" src="http://dev.sencha.com/deploy/ext-4.1.0-gpl/builds/ext-all-sandbox.js"></script>
+    <script type="text/javascript" src="charts-ext3-and-4.js"></script>
+</head>
+    <body id="docbody">
+        <h1>Make a chart of your catalogue search</h1>
+        <div style="margin: 10px;" id="content">
+    </body>
+</html>