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 2016/04/21 15:25:59 UTC
[2/2] syncope git commit: Filtering Enduser's index.html at generated
project's build time
Filtering Enduser's index.html at generated project's build time
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a7666a3f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a7666a3f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a7666a3f
Branch: refs/heads/master
Commit: a7666a3f984afb7623461f5b4d9ae9a45d28169a
Parents: 95a531f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Apr 21 15:25:49 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Apr 21 15:25:49 2016 +0200
----------------------------------------------------------------------
archetype/pom.xml | 1 -
.../archetype-resources/enduser/pom.xml | 28 ++++++++++++++++++++
.../resources/META-INF/resources/app/index.html | 4 +--
3 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a7666a3f/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 57c6b73..0a2ab72 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -239,7 +239,6 @@ under the License.
<resource>
<directory>../client/enduser/src/main/resources/META-INF/resources/app</directory>
<targetPath>${project.build.outputDirectory}/archetype-resources/enduser/src/main/webapp/app</targetPath>
- <filtering>true</filtering>
</resource>
<resource>
<directory>../fit/enduser-reference/src/main/resources</directory>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a7666a3f/archetype/src/main/resources/archetype-resources/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index 396239e..0c962d6 100644
--- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
@@ -92,6 +92,34 @@ under the License.
<build>
<finalName>syncope-enduser</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+ <filtering>true</filtering>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/webapp/app</directory>
+ <filtering>true</filtering>
+ <targetPath>app</targetPath>
+ <includes>
+ <include>index.html</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+
<resources>
<resource>
<directory>src/main/resources</directory>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a7666a3f/client/enduser/src/main/resources/META-INF/resources/app/index.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/index.html b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index b0a46a3..022105b 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -60,7 +60,7 @@ under the License.
</div>
</treasure-overlay-spinner>
- <script type="text/javascript" src="../webjars/jquery/${jquery.version}/jquery.js"></script>
+ <script src="../webjars/jquery/${jquery.version}/jquery.js"></script>
<script src="../webjars/angular/${angular.version}/angular.js"></script>
<script src="../webjars/angular-ui-router/${angular-ui-router.version}/angular-ui-router.js"></script>
<script src="../webjars/angular-animate/${angular.version}/angular-animate.js"></script>
@@ -75,7 +75,7 @@ under the License.
<script src="../webjars/angular-treasure-overlay-spinner/${angular-treasure-overlay-spinner.version}/dist/treasure-overlay-spinner.min.js"></script>
<script src="../webjars/ng-password-strength/${ng-password-strength.version}/dist/scripts/ng-password-strength.min.js"></script>
<script type="text/javascript" src="../webjars/bootstrap-select/${bootstrap-select.version}/js/bootstrap-select.min.js"></script>
- <script src="../webjars/FileSaver.js/${fileSaver.version}/FileSaver.js" type="text/javascript"></script>
+ <script src="../webjars/FileSaver.js/${fileSaver.version}/FileSaver.js"></script>
<script src="../webjars/lodash/${lodash.version}/lodash.min.js"></script>
<script src="../webjars/moment/${momentjs.version}/moment.js"></script>
<script src="../webjars/moment-jdateformatparser/${moment-jdateformatparser.version}/moment-jdateformatparser.js"></script>