You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/11/25 15:22:48 UTC
svn commit: r1545297 - in /syncope/trunk: ./ console/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/resources/org/apache/syncope/console/pages/
console/src/main/webapp/css/ console/src/main/webapp/css/images/
console/src/main...
Author: ilgrosso
Date: Mon Nov 25 14:22:47 2013
New Revision: 1545297
URL: http://svn.apache.org/r1545297
Log:
[SYNCOPE-443] Removed any JS, CSS and image files due to external dependency, via WebJars
Removed:
syncope/trunk/console/src/main/webapp/css/codemirror.css
syncope/trunk/console/src/main/webapp/css/codemirror_default_theme.css
syncope/trunk/console/src/main/webapp/css/images/warning.png
syncope/trunk/console/src/main/webapp/css/jquery-ui.css
syncope/trunk/console/src/main/webapp/scripts/
syncope/trunk/core/src/main/webapp/css/highlight.css
syncope/trunk/core/src/main/webapp/css/images/
syncope/trunk/core/src/main/webapp/css/jquery-ui.css
syncope/trunk/core/src/main/webapp/js/
Modified:
syncope/trunk/LICENSE
syncope/trunk/NOTICE
syncope/trunk/console/pom.xml
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePopupPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
syncope/trunk/console/src/main/webapp/css/bulk.css
syncope/trunk/console/src/main/webapp/css/fieldstyle.css
syncope/trunk/console/src/main/webapp/css/style.css
syncope/trunk/core/pom.xml
syncope/trunk/core/src/main/resources/wadl2html/index.xsl
syncope/trunk/core/src/main/resources/wadl2html/schema.xsl
syncope/trunk/core/src/main/webapp/css/style.css
syncope/trunk/legal_ext/LICENSE
syncope/trunk/pom.xml
Modified: syncope/trunk/LICENSE
URL: http://svn.apache.org/viewvc/syncope/trunk/LICENSE?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/LICENSE (original)
+++ syncope/trunk/LICENSE Mon Nov 25 14:22:47 2013
@@ -200,42 +200,3 @@
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.
-
-==
-
-For jQuery (http://jquery.com/):
-
-jquery-ui.js
-jquery-ui.css
-
-This is licensed under the terms of the MIT license.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-==
-
-For CodeMirror (http://codemirror.net/):
-
-codemirror.js
-xmlpure.js
-
-This is licensed under the terms of the MIT license, see above.
-
-==
Modified: syncope/trunk/NOTICE
URL: http://svn.apache.org/viewvc/syncope/trunk/NOTICE?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/NOTICE (original)
+++ syncope/trunk/NOTICE Mon Nov 25 14:22:47 2013
@@ -6,18 +6,3 @@ The Apache Software Foundation (http://w
The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed.
-
-==
-
-This product includes the jQuery JavaScript Library.
-Copyright (c) 2012 jQuery Foundation and other contributors,
-jQuery is dually licensed under the MIT and GPL licenses, and
-is included in this software distribution under the MIT license.
-For details, see the jQuery web site: http://jquery.com/
-
-==
-
-This product includes the CodeMirror JavaScript component.
-Copyright (C) 2012 by Marijn Haverbeke <ma...@gmail.com>
-
-==
Modified: syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Mon Nov 25 14:22:47 2013
@@ -124,6 +124,19 @@ under the License.
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>highlightjs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>codemirror</artifactId>
+ </dependency>
+
<!-- TEST -->
<dependency>
<groupId>org.activiti</groupId>
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractBasePage.java Mon Nov 25 14:22:47 2013
@@ -29,6 +29,8 @@ import org.apache.syncope.console.rest.U
import org.apache.syncope.console.rest.UserSelfRestClient;
import org.apache.syncope.markup.head.MetaHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -91,8 +93,7 @@ public class AbstractBasePage extends We
protected boolean modalResult = false;
public AbstractBasePage() {
- super();
- setupFeedbackPanel();
+ this(null);
}
public AbstractBasePage(final PageParameters parameters) {
@@ -117,4 +118,11 @@ public class AbstractBasePage extends We
public void setModalResult(final boolean operationResult) {
this.modalResult = operationResult;
}
+
+ @Override
+ public void renderHead(final IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(new PriorityHeaderItem(meta));
+ }
+
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java Mon Nov 25 14:22:47 2013
@@ -19,8 +19,6 @@
package org.apache.syncope.console.pages;
import org.apache.syncope.console.commons.CloseOnESCBehavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.PriorityHeaderItem;
/**
* Syncope Modal Window.
@@ -34,10 +32,4 @@ public abstract class BaseModalPage exte
add(new CloseOnESCBehavior("keyup"));
}
-
- @Override
- public void renderHead(final IHeaderResponse response) {
- super.renderHead(response);
- response.render(new PriorityHeaderItem(meta));
- }
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java Mon Nov 25 14:22:47 2013
@@ -26,8 +26,6 @@ import org.apache.wicket.ajax.IAjaxIndic
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -40,9 +38,7 @@ public class BasePage extends AbstractBa
private static final long serialVersionUID = 1571997737305598502L;
public BasePage() {
- super();
-
- pageSetup();
+ this(null);
}
public BasePage(final PageParameters parameters) {
@@ -112,10 +108,4 @@ public class BasePage extends AbstractBa
}
});
}
-
- @Override
- public void renderHead(final IHeaderResponse response) {
- super.renderHead(response);
- response.render(new PriorityHeaderItem(meta));
- }
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePopupPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePopupPage.java?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePopupPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePopupPage.java Mon Nov 25 14:22:47 2013
@@ -18,16 +18,8 @@
*/
package org.apache.syncope.console.pages;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.PriorityHeaderItem;
-
public class BasePopupPage extends AbstractBasePage {
private static final long serialVersionUID = -2633667311332659505L;
- @Override
- public void renderHead(final IHeaderResponse response) {
- super.renderHead(response);
- response.render(new PriorityHeaderItem(meta));
- }
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Mon Nov 25 14:22:47 2013
@@ -78,7 +78,6 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.request.resource.DynamicImageResource;
import org.apache.wicket.request.resource.IResource;
@@ -131,8 +130,8 @@ public class Configuration extends BaseP
private int notificationPaginatorRows;
- public Configuration(final PageParameters parameters) {
- super(parameters);
+ public Configuration() {
+ super();
add(createConfigWin = new ModalWindow("createConfigurationWin"));
add(editConfigWin = new ModalWindow("editConfigurationWin"));
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Mon Nov 25 14:22:47 2013
@@ -20,11 +20,11 @@ under the License.
<head>
<title></title>
- <link rel="stylesheet" type="text/css" href="css/jquery-ui.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/fieldstyle.css" media="all"/>
- <script type="text/javascript" src="scripts/jquery-ui.js"></script>
+ <script type="text/javascript" src="webjars/jquery-ui/${jquery-ui.version}/ui/minified/jquery-ui.min.js"></script>
<script type="text/javascript">
$(function() {
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Mon Nov 25 14:22:47 2013
@@ -32,11 +32,11 @@ under the License.
height: 16px !important;
}
</style>
- <link rel="stylesheet" type="text/css" href="css/jquery-ui.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/fieldstyle.css" />
- <script type="text/javascript" src="scripts/jquery-ui.js"></script>
+ <script type="text/javascript" src="webjars/jquery-ui/${jquery-ui.version}/ui/minified/jquery-ui.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html Mon Nov 25 14:22:47 2013
@@ -18,11 +18,10 @@ under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:head>
- <link rel="stylesheet" type="text/css" href="css/codemirror.css" />
- <link rel="stylesheet" type="text/css" href="css/codemirror_default_theme.css" />
+ <link rel="stylesheet" type="text/css" href="webjars/codemirror/${codemirror.version}/lib/codemirror.css"/>
- <script type="text/javascript" src="scripts/codemirror.js"></script>
- <script type="text/javascript" src="scripts/xmlpure.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/lib/codemirror.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/mode/xml/xml.js"></script>
<script type="text/javascript">
function updateTextArea(editor) {
document.getElementById("workflowDefArea").value = editor.getValue();
@@ -51,7 +50,7 @@ under the License.
</form>
<script>
var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"),
- {mode: {name: "xmlpure"}, lineNumbers: true, onChange: updateTextArea});
+ {lineNumbers: true, onChange: updateTextArea});
</script>
</wicket:extend>
</html>
Modified: syncope/trunk/console/src/main/webapp/css/bulk.css
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/bulk.css?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/bulk.css (original)
+++ syncope/trunk/console/src/main/webapp/css/bulk.css Mon Nov 25 14:22:47 2013
@@ -1,79 +1,97 @@
- th.checkGroupColumn{
- width: 20px;
- }
-
- td.checkGroupColumn{
- text-align: center;
- }
-
- div.bulkAction{
- display:inline-table;
- }
-
- div.bulkActionCell{
- display: table-cell;
- vertical-align: middle;
- text-align: center;
- width: 40px;
- padding-left: 7px;
- }
-
- .pageRowElement{
- display: inline-table;
- width: 95%;
- }
-
- div#selectedObjects{
- text-align: center;
- margin-top: 10px;
- }
-
- div#selectedObjects table {
- margin: 1em 0;
- border-collapse: collapse;
- }
-
- div#selectedObjects table td, div#selectedObjects table th {
- border: 1px solid #eee;
- padding: .6em 10px;
- }
-
- div#actionRow{
- height: 30px;
- overflow: hidden;
- text-align: left;
- margin-top: 10px;
- }
-
- div#actions{
- display: inline-table;
- height: 30px;
- overflow: hidden;
- }
-
- div#actions div#actionPanel{
- display: table-cell;
- height: 30px;
- overflow: hidden;
- cursor: auto;
- background: none;
- padding: 0px 10px;
- vertical-align: middle;
- }
-
- div#actions div#cancelBtmForm{
- display: table-cell;
- height: 30px;
- overflow: hidden;
- vertical-align: middle;
- padding-left: 3px;
- }
-
- div#actions div#cancelBtmForm form{
- padding: 0px;
- margin: 0px;
- }
-
- div#actions div#cancelBtmForm form input#cancel{
- padding: 0.6em 1em;
- }
+/*
+ * 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.
+ */
+th.checkGroupColumn{
+ width: 20px;
+}
+
+td.checkGroupColumn{
+ text-align: center;
+}
+
+div.bulkAction{
+ display:inline-table;
+}
+
+div.bulkActionCell{
+ display: table-cell;
+ vertical-align: middle;
+ text-align: center;
+ width: 40px;
+ padding-left: 7px;
+}
+
+.pageRowElement{
+ display: inline-table;
+ width: 95%;
+}
+
+div#selectedObjects{
+ text-align: center;
+ margin-top: 10px;
+}
+
+div#selectedObjects table {
+ margin: 1em 0;
+ border-collapse: collapse;
+}
+
+div#selectedObjects table td, div#selectedObjects table th {
+ border: 1px solid #eee;
+ padding: .6em 10px;
+}
+
+div#actionRow{
+ height: 30px;
+ overflow: hidden;
+ text-align: left;
+ margin-top: 10px;
+}
+
+div#actions{
+ display: inline-table;
+ height: 30px;
+ overflow: hidden;
+}
+
+div#actions div#actionPanel{
+ display: table-cell;
+ height: 30px;
+ overflow: hidden;
+ cursor: auto;
+ background: none;
+ padding: 0px 10px;
+ vertical-align: middle;
+}
+
+div#actions div#cancelBtmForm{
+ display: table-cell;
+ height: 30px;
+ overflow: hidden;
+ vertical-align: middle;
+ padding-left: 3px;
+}
+
+div#actions div#cancelBtmForm form{
+ padding: 0px;
+ margin: 0px;
+}
+
+div#actions div#cancelBtmForm form input#cancel{
+ padding: 0.6em 1em;
+}
Modified: syncope/trunk/console/src/main/webapp/css/fieldstyle.css
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/fieldstyle.css?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/fieldstyle.css (original)
+++ syncope/trunk/console/src/main/webapp/css/fieldstyle.css Mon Nov 25 14:22:47 2013
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
.drop_button{
vertical-align: middle;
}
@@ -44,45 +62,45 @@
}
div#formtable {
- display: table;
- width: 100%;
+ display: table;
+ width: 100%;
}
div#formtable > span:first-of-type {
- display: table-row-group;
- width: 100%;
+ display: table-row-group;
+ width: 100%;
}
div.tablerow {
- display: inline-table;
- padding: 5px;
- width: 100%;
+ display: inline-table;
+ padding: 5px;
+ width: 100%;
}
div.alt {
- background: #eff3ea;
+ background: #eff3ea;
}
div.tablecolumn_label{
- display: table-cell;
- font-size: 12px;
- vertical-align: middle;
- font-family: Verdana,Tahoma,sans-serif;
- width: 30%;
+ display: table-cell;
+ font-size: 12px;
+ vertical-align: middle;
+ font-family: Verdana,Tahoma,sans-serif;
+ width: 30%;
}
div.tablecolumn_field{
- display: table-cell;
- vertical-align: middle;
- font-family: Verdana,Tahoma,sans-serif;
- width: 70%;
+ display: table-cell;
+ vertical-align: middle;
+ font-family: Verdana,Tahoma,sans-serif;
+ width: 70%;
}
div.tablecolumn_check{
- display: table-cell;
- margin-right: 5px;
- margin-left: 2px;
- vertical-align: middle;
+ display: table-cell;
+ margin-right: 5px;
+ margin-left: 2px;
+ vertical-align: middle;
}
.ui-tabs .ui-tabs-panel {
Modified: syncope/trunk/console/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/style.css?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/style.css (original)
+++ syncope/trunk/console/src/main/webapp/css/style.css Mon Nov 25 14:22:47 2013
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
body {
margin: 0px;
padding: 0px;
@@ -171,25 +189,8 @@ select[disabled] {
.feedbackPanelERROR {
color: red;
- /*font-weight: bold;
- margin: 0px;
- list-style-type: none;
- background:url("images/ui-bg_highlight-soft_75_cccccc_1x100_red.png") repeat-x scroll 50% 50% #CCCCCC;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border: 1px solid gray;
- border-radius: 3px;
- padding: 5px;*/
}
-/*
-.feedbackPanelERROR span {
- background: url("images/warning.png") no-repeat left;
- border:0 none;
- font-size:12px;
- padding-left: 24px;
-}*/
-
.feedbackPanelINFO span {
background: url("../img/ok.png") no-repeat left;
border:0 none;
@@ -342,7 +343,7 @@ div#attributes-view input {
}
.feedbackPanelERROR span {
- background: url("images/warning.png") no-repeat left;
+ background: url("../img/warning.png") no-repeat left;
border:0 none;
font-size:12px;
padding-left: 24px;
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Mon Nov 25 14:22:47 2013
@@ -288,6 +288,19 @@ under the License.
<artifactId>jasypt</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>highlightjs</artifactId>
+ </dependency>
+
<!-- TEST -->
<dependency>
<groupId>org.apache.syncope</groupId>
Modified: syncope/trunk/core/src/main/resources/wadl2html/index.xsl
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/wadl2html/index.xsl?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/wadl2html/index.xsl (original)
+++ syncope/trunk/core/src/main/resources/wadl2html/index.xsl Mon Nov 25 14:22:47 2013
@@ -46,12 +46,12 @@
<xsl:value-of select="wadl:doc/@title"/>
</title>
- <link rel="stylesheet" href="{$contextPath}/css/jquery-ui.css"/>
+ <link rel="stylesheet" href="{$contextPath}/webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css"/>
<link rel="stylesheet" href="{$contextPath}/css/style.css"/>
- <script src="{$contextPath}/js/jquery.js">
+ <script src="{$contextPath}/webjars/jquery/${jquery.version}/jquery.min.js">
</script>
- <script src="{$contextPath}/js/jquery-ui.js">
+ <script src="{$contextPath}/webjars/jquery-ui/${jquery-ui.version}/ui/minified/jquery-ui.min.js">
</script>
<script>
//<![CDATA[
Modified: syncope/trunk/core/src/main/resources/wadl2html/schema.xsl
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/wadl2html/schema.xsl?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/wadl2html/schema.xsl (original)
+++ syncope/trunk/core/src/main/resources/wadl2html/schema.xsl Mon Nov 25 14:22:47 2013
@@ -37,9 +37,9 @@
<xsl:value-of select="wadl:doc/@title"/>
</title>
- <link rel="stylesheet" href="{$contextPath}/css/highlight.css"/>
+ <link rel="stylesheet" href="{$contextPath}/webjars/highlightjs/${highlightjs.version}/styles/default.min.css"/>
- <script src="{$contextPath}/js/highlight.pack.js">
+ <script src="{$contextPath}/webjars/highlightjs/${highlightjs.version}/highlight.min.js">
</script>
<script>
hljs.initHighlightingOnLoad();
Modified: syncope/trunk/core/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/webapp/css/style.css?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/core/src/main/webapp/css/style.css (original)
+++ syncope/trunk/core/src/main/webapp/css/style.css Mon Nov 25 14:22:47 2013
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
body {
font-family: "Verdana,Arial,sans-serif";
font-size: 0.9em;
Modified: syncope/trunk/legal_ext/LICENSE
URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/LICENSE?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/legal_ext/LICENSE (original)
+++ syncope/trunk/legal_ext/LICENSE Mon Nov 25 14:22:47 2013
@@ -817,29 +817,16 @@ This is licensed under the AL 2.0, see a
==
For jQuery (http://jquery.com/):
-
-jquery.js
-jquery-ui.js
-jquery-ui.css
-
This is licensed under the terms of the MIT license, see above.
==
For CodeMirror (http://codemirror.net/):
-
-codemirror.js
-xmlpure.js
-
This is licensed under the terms of the MIT license, see above.
==
For highlight.js (http://highlightjs.org/):
-
-highlight.pack.js
-highlight.css
-
This is licensed under the BSD license, see above.
==
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1545297&r1=1545296&r2=1545297&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Nov 25 14:22:47 2013
@@ -343,6 +343,11 @@ under the License.
<jasypt.version>1.9.1</jasypt.version>
+ <jquery.version>1.10.2</jquery.version>
+ <jquery-ui.version>1.10.3</jquery-ui.version>
+ <highlightjs.version>7.3</highlightjs.version>
+ <codemirror.version>3.20</codemirror.version>
+
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
<connid.location>file:${bundles.directory}/</connid.location>
<log.directory>${project.build.directory}/log</log.directory>
@@ -792,6 +797,27 @@ under the License.
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ <version>${jquery.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui</artifactId>
+ <version>${jquery-ui.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>highlightjs</artifactId>
+ <version>${highlightjs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>${codemirror.version}</version>
+ </dependency>
+
<!-- TEST -->
<dependency>
<groupId>junit</groupId>
@@ -1165,8 +1191,6 @@ under the License.
<exclude>**/META-INF/cxf/**</exclude>
<exclude>**/META-INF/services/**</exclude>
<exclude>**/META-INF/MANIFEST.MF</exclude>
- <exclude>**/*.css</exclude>
- <exclude>**/*.js</exclude>
<exclude>**/*.csv</exclude>
<exclude>**/archetype-resources/**</exclude>
<exclude>**/goal.txt</exclude>