Commit 8e56e175745d880ca0b765b068a7de81042124b4
1 parent
a276973d22
Exists in
master
Remade SDK projects with the prefix name alfresco-skype
Showing
61 changed files
with
253 additions
and
252 deletions
Show diff stats
README
pom.xml
1 | 1 | index b5ea143b7509f7a85830d020f59b0e07565b120c..8d137d4c90b2f86b787db78c689c8efeedb73f20 100644 |
2 | --- a/skype-integration/pom.xml | |
2 | +++ b/pom.xml | |
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
3 | 3 | <modelVersion>4.0.0</modelVersion> |
4 | 4 | <groupId>org.alfresco.skype</groupId> |
5 | - <artifactId>skype-integration-parent</artifactId> | |
5 | + <artifactId>alfresco-skype-parent</artifactId> | |
6 | 6 | <version>1.0-SNAPSHOT</version> |
7 | 7 | <name>Alfresco Repository and Share Quickstart with database and an embedded Tomcat runner.</name> |
8 | 8 | <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project |
... | ... | @@ -23,9 +23,10 @@ |
23 | 23 | <properties> |
24 | 24 | <!-- The following are default values for data location, Alfresco Community version, and Records Management Module version. |
25 | 25 | Uncomment if you need to change (Note. current default version for Enterprise edition is 5.0.1) |
26 | - <alfresco.version>5.0.d</alfresco.version> | |
27 | 26 | <alfresco.rm.version>2.3</alfresco.rm.version> |
28 | - <alfresco.data.location>/absolute/path/to/alf_data_dev</alfresco.data.location> --> | |
27 | + <alfresco.data.location>/absolute/path/to/alf_data_dev</alfresco.data.location> | |
28 | + --> | |
29 | + <alfresco.version>5.0.2</alfresco.version> | |
29 | 30 | |
30 | 31 | <!-- This control the root logging level for all apps uncomment and change, defaults to WARN |
31 | 32 | <app.log.root.level>WARN</app.log.root.level> |
... | ... | @@ -94,4 +95,4 @@ |
94 | 95 | <module>share</module> |
95 | 96 | <module>runner</module> |
96 | 97 | </modules> |
97 | -</project> | |
98 | 98 | \ No newline at end of file |
99 | +</project> | ... | ... |
repo-amp/pom.xml
1 | 1 | index 83c584d5879f8e1dc7e194fc9a18fd41b2926fa3..650755ecea618249bae7d5a6b290fe11fade72e5 100644 |
2 | --- a/skype-integration/repo-amp/pom.xml | |
2 | +++ b/repo-amp/pom.xml | |
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
3 | 3 | <modelVersion>4.0.0</modelVersion> |
4 | - <artifactId>skype-integration-repo-amp</artifactId> | |
4 | + <artifactId>repo-amp</artifactId> | |
5 | 5 | <name>Alfresco Repository AMP Module</name> |
6 | 6 | <packaging>amp</packaging> |
7 | 7 | <description>This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR aggregator</description> |
8 | 8 | |
9 | 9 | <parent> |
10 | 10 | <groupId>org.alfresco.skype</groupId> |
11 | - <artifactId>skype-integration-parent</artifactId> | |
11 | + <artifactId>alfresco-skype</artifactId> | |
12 | 12 | <version>1.0-SNAPSHOT</version> |
13 | 13 | </parent> |
14 | 14 | ... | ... |
repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml
repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl
repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js
repo-amp/src/main/amp/config/alfresco/module/repo-amp/alfresco-global.properties
repo-amp/src/main/amp/config/alfresco/module/repo-amp/context/bootstrap-context.xml
repo-amp/src/main/amp/config/alfresco/module/repo-amp/context/service-context.xml
repo-amp/src/main/amp/config/alfresco/module/repo-amp/context/webscript-context.xml
repo-amp/src/main/amp/config/alfresco/module/repo-amp/model/content-model.xml
1 | 1 | index 6d606b7f5f38ffb002f31e5461cc6512e4eb2ce8..91f54ae6d7b7ecfef756c1bbdd84acf4ceb7765d 100644 |
2 | --- a/skype-integration/repo-amp/src/main/amp/config/alfresco/module/repo-amp/model/content-model.xml | |
2 | +++ b/repo-amp/src/main/amp/config/alfresco/module/repo-amp/model/content-model.xml | |
1 | -<?xml version="1.0" encoding="UTF-8"?> | |
2 | -<model name="myc:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0"> | |
3 | - | |
4 | - <!-- Optional meta-data about the model --> | |
5 | - <description>Document Model for Repo Extension X</description> | |
6 | - <author>My Name</author> | |
7 | - <version>1.0</version> | |
8 | - | |
9 | - <imports> | |
10 | - <!-- Import Alfresco Dictionary Definitions --> | |
11 | - <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/> | |
12 | - <!-- Import Alfresco Content Domain Model Definitions --> | |
13 | - <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/> | |
14 | - <!-- Import Alfresco System Model Definitions --> | |
15 | - <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/> | |
16 | - </imports> | |
17 | - | |
18 | - <!-- Custom namespace for your domain --> | |
19 | - <namespaces> | |
20 | - <namespace uri="http://www.mycompany.com/model/content/1.0" prefix="myc"/> | |
21 | - </namespaces> | |
22 | - | |
23 | - <!-- =============================================================================================================== | |
24 | - Constraints, Types, and Aspects go here... | |
25 | - --> | |
26 | - | |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<model name="myc:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0"> | |
3 | + | |
4 | + <!-- Optional meta-data about the model --> | |
5 | + <description>Document Model for Repo Extension X</description> | |
6 | + <author>My Name</author> | |
7 | + <version>1.0</version> | |
8 | + | |
9 | + <imports> | |
10 | + <!-- Import Alfresco Dictionary Definitions --> | |
11 | + <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/> | |
12 | + <!-- Import Alfresco Content Domain Model Definitions --> | |
13 | + <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/> | |
14 | + <!-- Import Alfresco System Model Definitions --> | |
15 | + <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/> | |
16 | + </imports> | |
17 | + | |
18 | + <!-- Custom namespace for your domain --> | |
19 | + <namespaces> | |
20 | + <namespace uri="http://www.mycompany.com/model/content/1.0" prefix="myc"/> | |
21 | + </namespaces> | |
22 | + | |
23 | + <!-- =============================================================================================================== | |
24 | + Constraints, Types, and Aspects go here... | |
25 | + --> | |
26 | + | |
27 | 27 | </model> |
28 | 28 | \ No newline at end of file | ... | ... |
repo-amp/src/main/amp/config/alfresco/module/repo-amp/model/workflow-model.xml
1 | 1 | index 3f7635f695a1dea98ead078a2f46d273620916ea..580e3f2077be3fc354b208c1a7a58d955b81b155 100644 |
2 | --- a/skype-integration/repo-amp/src/main/amp/config/alfresco/module/repo-amp/model/workflow-model.xml | |
2 | +++ b/repo-amp/src/main/amp/config/alfresco/module/repo-amp/model/workflow-model.xml | |
1 | -<?xml version="1.0" encoding="UTF-8"?> | |
2 | -<model name="myw:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0"> | |
3 | - <!-- Optional meta-data about the model --> | |
4 | - <description>Workflow Model for Repo Extension X</description> | |
5 | - <author>My Name</author> | |
6 | - <version>1.0</version> | |
7 | - | |
8 | - <imports> | |
9 | - <!-- Import Alfresco Dictionary Definitions --> | |
10 | - <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/> | |
11 | - <!-- Import Alfresco Content Domain Model Definitions --> | |
12 | - <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/> | |
13 | - <!-- Import Alfresco Workflow Model Definitions --> | |
14 | - <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/> | |
15 | - </imports> | |
16 | - | |
17 | - <!-- Custom namespace for your domain --> | |
18 | - <namespaces> | |
19 | - <namespace uri="http://www.mycompany.com/model/workflow/1.0" prefix="myw"/> | |
20 | - </namespaces> | |
21 | - | |
22 | - <!-- =============================================================================================================== | |
23 | - Constraints, Types, and Aspects go here... | |
24 | - --> | |
25 | -</model> | |
26 | - | |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<model name="myw:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0"> | |
3 | + <!-- Optional meta-data about the model --> | |
4 | + <description>Workflow Model for Repo Extension X</description> | |
5 | + <author>My Name</author> | |
6 | + <version>1.0</version> | |
7 | + | |
8 | + <imports> | |
9 | + <!-- Import Alfresco Dictionary Definitions --> | |
10 | + <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/> | |
11 | + <!-- Import Alfresco Content Domain Model Definitions --> | |
12 | + <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/> | |
13 | + <!-- Import Alfresco Workflow Model Definitions --> | |
14 | + <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/> | |
15 | + </imports> | |
16 | + | |
17 | + <!-- Custom namespace for your domain --> | |
18 | + <namespaces> | |
19 | + <namespace uri="http://www.mycompany.com/model/workflow/1.0" prefix="myw"/> | |
20 | + </namespaces> | |
21 | + | |
22 | + <!-- =============================================================================================================== | |
23 | + Constraints, Types, and Aspects go here... | |
24 | + --> | |
25 | +</model> | |
26 | + | ... | ... |
repo-amp/src/main/amp/config/alfresco/module/repo-amp/module-context.xml
repo-amp/src/main/amp/module.properties
1 | 1 | index e3725ac4366c2dd28cb88a6ec814b63b2e70dd4a..ff42da63e7c95b22b8e89aca5b465220b820d3c2 100644 |
2 | --- a/skype-integration/repo-amp/src/main/amp/module.properties | |
2 | +++ b/repo-amp/src/main/amp/module.properties | |
1 | -# Licensed to the Apache Software Foundation (ASF) under one or more | |
2 | -# contributor license agreements. See the NOTICE file distributed with | |
3 | -# this work for additional information regarding copyright ownership. | |
4 | -# The ASF licenses this file to You under the Apache License, Version 2.0 | |
5 | -# (the "License"); you may not use this file except in compliance with | |
6 | -# the License. You may obtain a copy of the License at | |
7 | -# | |
8 | -# http://www.apache.org/licenses/LICENSE-2.0 | |
9 | -# | |
10 | -# Unless required by applicable law or agreed to in writing, software | |
11 | -# distributed under the License is distributed on an "AS IS" BASIS, | |
12 | -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
13 | -# See the License for the specific language governing permissions and | |
14 | -# limitations under the License. | |
15 | - | |
16 | - | |
17 | - | |
18 | -# SDK Sample module | |
19 | - | |
20 | -# ==== Beginning of Alfresco required/optional properties ====== # | |
21 | - | |
22 | -module.id=${project.artifactId} | |
23 | -#module.aliases=myModule-123, my-module | |
24 | -module.title=${project.name} | |
25 | -module.description=${project.description} | |
26 | -module.version=${noSnapshotVersion} | |
27 | - | |
28 | -# The following optional properties can be used to prevent the module from being added | |
29 | -# to inappropriate versions of the WAR file. | |
30 | -# module.repo.version.min=2.0 | |
31 | -# module.repo.version.max=2.1 | |
32 | - | |
33 | -# FIXME: This dependencies should come out of mvn dependencies on amp | |
34 | - | |
35 | -# The following describe dependencies on other modules | |
36 | -# Depends on net.sf.myproject.module.SupportModuleA version ${version} or later | |
37 | -# module.depends.net.sf.myproject.module.SupportModuleA=${version}-* | |
38 | -# Depends on net.sf.myproject.module.SupportModuleA version ${version} to 2.0 | |
39 | -# module.depends.net.sf.myproject.module.SupportModuleB=${version}-2.0 | |
40 | -# Depends on net.sf.myproject.module.SupportModuleC - any version | |
41 | -# module.depends.net.sf.myproject.module.SupportModuleB=* | |
42 | - | |
43 | - | |
44 | -# ==== End of Alfresco required/optional properties ======= # | |
45 | - | |
46 | - | |
1 | +# Licensed to the Apache Software Foundation (ASF) under one or more | |
2 | +# contributor license agreements. See the NOTICE file distributed with | |
3 | +# this work for additional information regarding copyright ownership. | |
4 | +# The ASF licenses this file to You under the Apache License, Version 2.0 | |
5 | +# (the "License"); you may not use this file except in compliance with | |
6 | +# the License. You may obtain a copy of the License at | |
7 | +# | |
8 | +# http://www.apache.org/licenses/LICENSE-2.0 | |
9 | +# | |
10 | +# Unless required by applicable law or agreed to in writing, software | |
11 | +# distributed under the License is distributed on an "AS IS" BASIS, | |
12 | +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
13 | +# See the License for the specific language governing permissions and | |
14 | +# limitations under the License. | |
15 | + | |
16 | + | |
17 | + | |
18 | +# SDK Sample module | |
19 | + | |
20 | +# ==== Beginning of Alfresco required/optional properties ====== # | |
21 | + | |
22 | +module.id=${project.artifactId} | |
23 | +#module.aliases=myModule-123, my-module | |
24 | +module.title=${project.name} | |
25 | +module.description=${project.description} | |
26 | +module.version=${noSnapshotVersion} | |
27 | + | |
28 | +# The following optional properties can be used to prevent the module from being added | |
29 | +# to inappropriate versions of the WAR file. | |
30 | +# module.repo.version.min=2.0 | |
31 | +# module.repo.version.max=2.1 | |
32 | + | |
33 | +# FIXME: This dependencies should come out of mvn dependencies on amp | |
34 | + | |
35 | +# The following describe dependencies on other modules | |
36 | +# Depends on net.sf.myproject.module.SupportModuleA version ${version} or later | |
37 | +# module.depends.net.sf.myproject.module.SupportModuleA=${version}-* | |
38 | +# Depends on net.sf.myproject.module.SupportModuleA version ${version} to 2.0 | |
39 | +# module.depends.net.sf.myproject.module.SupportModuleB=${version}-2.0 | |
40 | +# Depends on net.sf.myproject.module.SupportModuleC - any version | |
41 | +# module.depends.net.sf.myproject.module.SupportModuleB=* | |
42 | + | |
43 | + | |
44 | +# ==== End of Alfresco required/optional properties ======= # | |
45 | + | |
46 | + | |
47 | 47 | # ==== Beginning of module required properties/optional ====== # |
48 | 48 | \ No newline at end of file | ... | ... |
repo-amp/src/main/amp/web/css/demoamp.css
repo-amp/src/main/amp/web/jsp/demoamp.jsp
repo-amp/src/main/amp/web/licenses/README-licenses.txt
repo-amp/src/main/amp/web/scripts/demoamp.js
repo-amp/src/main/java/org/alfresco/skype/demoamp/Demo.java
repo-amp/src/main/java/org/alfresco/skype/demoamp/DemoComponent.java
repo-amp/src/main/java/org/alfresco/skype/demoamp/HelloWorldWebScript.java
repo-amp/src/test/java/org/alfresco/skype/demoamp/test/DemoComponentTest.java
repo-amp/src/test/properties/local/alfresco-global.properties
repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
repo-amp/src/test/resources/test-log4j.properties
repo/pom.xml
1 | 1 | index 94c37af7b0b76383c566875574180ef8ca3ef40d..a89c06578d7be0325457b3d7ce403990453b50d0 100644 |
2 | --- a/skype-integration/repo/pom.xml | |
2 | +++ b/repo/pom.xml | |
... | ... | @@ -13,14 +13,14 @@ |
13 | 13 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
14 | 14 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
15 | 15 | <modelVersion>4.0.0</modelVersion> |
16 | - <artifactId>skype-integration-repo</artifactId> | |
16 | + <artifactId>repo</artifactId> | |
17 | 17 | <name>Alfresco Repository WAR Aggregator</name> |
18 | 18 | <packaging>war</packaging> |
19 | 19 | <description>Alfresco Repository aggregator, installs your repository AMPs in the Alfresco WAR for aggregation and easy deployment purposes</description> |
20 | 20 | |
21 | 21 | <parent> |
22 | 22 | <groupId>org.alfresco.skype</groupId> |
23 | - <artifactId>skype-integration-parent</artifactId> | |
23 | + <artifactId>alfresco-skype</artifactId> | |
24 | 24 | <version>1.0-SNAPSHOT</version> |
25 | 25 | </parent> |
26 | 26 | |
... | ... | @@ -42,7 +42,7 @@ |
42 | 42 | <!-- Demonstrating the dependency / installation of the repo AMP developed in the 'repo-amp' module --> |
43 | 43 | <dependency> |
44 | 44 | <groupId>${project.groupId}</groupId> |
45 | - <artifactId>skype-integration-repo-amp</artifactId> | |
45 | + <artifactId>repo-amp</artifactId> | |
46 | 46 | <version>${project.version}</version> |
47 | 47 | <type>amp</type> |
48 | 48 | </dependency> |
... | ... | @@ -91,7 +91,7 @@ |
91 | 91 | <!-- Add / sort your AMPs here --> |
92 | 92 | <overlay> |
93 | 93 | <groupId>${project.groupId}</groupId> |
94 | - <artifactId>skype-integration-repo-amp</artifactId> | |
94 | + <artifactId>repo-amp</artifactId> | |
95 | 95 | <type>amp</type> |
96 | 96 | </overlay> |
97 | 97 | <!-- Uncomment if you are using SPP --> | ... | ... |
repo/src/main/properties/local/alfresco-global.properties
repo/src/main/resources/alfresco/extension/dev-log4j.properties
run.bat
1 | 1 | index b92268ee1fe7a696d18a0e622583a90b4ce94620..aef41d0a09f153e6d3ab273bc43b861c11ae4c78 100644 |
2 | --- a/skype-integration/run.bat | |
2 | +++ b/run.bat | |
1 | -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | |
2 | -:: Dev environment startup script for Alfresco Community :: | |
3 | -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | |
4 | -@echo off | |
5 | - | |
6 | -set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\1.2.3.RELEASE\springloaded-1.2.3.RELEASE.jar | |
7 | - | |
8 | -if not exist %springloadedfile% ( | |
9 | - mvn validate -Psetup | |
10 | -) | |
11 | - | |
12 | -set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G | |
13 | - | |
14 | -mvn clean install -Prun -nsu | |
15 | -:: mvn install -Prun | |
1 | +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | |
2 | +:: Dev environment startup script for Alfresco Community :: | |
3 | +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | |
4 | +@echo off | |
5 | + | |
6 | +set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\1.2.3.RELEASE\springloaded-1.2.3.RELEASE.jar | |
7 | + | |
8 | +if not exist %springloadedfile% ( | |
9 | + mvn validate -Psetup | |
10 | +) | |
11 | + | |
12 | +set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G | |
13 | + | |
14 | +mvn clean install -Prun -nsu | |
15 | +:: mvn install -Prun | ... | ... |
run.sh
1 | 1 | index f8fe84acbf69290fed7e5381701815a240729b8f..1907d3f53edbea1eb1a9db7c2888fe10d2d78051 100755 |
2 | --- a/skype-integration/run.sh | |
2 | +++ b/run.sh | |
... | ... | @@ -6,4 +6,4 @@ springloadedfile=~/.m2/repository/org/springframework/springloaded/1.2.3.RELEASE |
6 | 6 | if [ ! -f $springloadedfile ]; then |
7 | 7 | mvn validate -Psetup |
8 | 8 | fi |
9 | -MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn clean install -Prun | |
10 | 9 | \ No newline at end of file |
10 | +MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:MaxPermSize=512m" mvn clean install -Prun | ... | ... |
runner/pom.xml
1 | 1 | index 093019616b1c0c6abbde960b0d80f09d194abbf8..9f28d7ce92d171bc950f42523db50743b450d3cc 100644 |
2 | --- a/skype-integration/runner/pom.xml | |
2 | +++ b/runner/pom.xml | |
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
3 | 3 | <modelVersion>4.0.0</modelVersion> |
4 | - <artifactId>skype-integration-runner</artifactId> | |
4 | + <artifactId>runner</artifactId> | |
5 | 5 | <name>Alfresco, Share and Solr4 Tomcat Runner</name> |
6 | 6 | <packaging>pom</packaging> |
7 | 7 | <description>Alfresco, Share and Solr4 Tomcat Runner</description> |
8 | 8 | |
9 | 9 | <parent> |
10 | 10 | <groupId>org.alfresco.skype</groupId> |
11 | - <artifactId>skype-integration-parent</artifactId> | |
11 | + <artifactId>alfresco-skype</artifactId> | |
12 | 12 | <version>1.0-SNAPSHOT</version> |
13 | 13 | </parent> |
14 | 14 | |
... | ... | @@ -85,7 +85,7 @@ |
85 | 85 | <webapps> |
86 | 86 | <webapp> |
87 | 87 | <groupId>${project.groupId}</groupId> |
88 | - <artifactId>skype-integration-repo</artifactId> | |
88 | + <artifactId>repo</artifactId> | |
89 | 89 | <version>${project.version}</version> |
90 | 90 | <type>war</type> |
91 | 91 | <!-- Make sure webapp is loaded with context and everything, |
... | ... | @@ -96,7 +96,7 @@ |
96 | 96 | </webapp> |
97 | 97 | <webapp> |
98 | 98 | <groupId>${project.groupId}</groupId> |
99 | - <artifactId>skype-integration-share</artifactId> | |
99 | + <artifactId>share</artifactId> | |
100 | 100 | <version>${project.version}</version> |
101 | 101 | <type>war</type> |
102 | 102 | <asWebapp>true</asWebapp> | ... | ... |
runner/src/main/webapp/index.html
runner/test-ng/testng-alfresco-share.xml
runner/tomcat/context-repo.xml
runner/tomcat/context-share.xml
runner/tomcat/context-solr.xml
share-amp/pom.xml
1 | 1 | index 684b304dea8e9f0d56e3c082a9df5ca4be2d297e..f341bb4849abcf672edb9e88fa18f8744ab2c77d 100644 |
2 | --- a/skype-integration/share-amp/pom.xml | |
2 | +++ b/share-amp/pom.xml | |
... | ... | @@ -2,14 +2,14 @@ |
2 | 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
3 | 3 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
4 | 4 | <modelVersion>4.0.0</modelVersion> |
5 | - <artifactId>skype-integration-share-amp</artifactId> | |
5 | + <artifactId>share-amp</artifactId> | |
6 | 6 | <name>Alfresco Share AMP Module</name> |
7 | 7 | <packaging>amp</packaging> |
8 | 8 | <description>This is a sample Alfresco Share AMP project, depended upon by the share WAR module</description> |
9 | 9 | |
10 | 10 | <parent> |
11 | 11 | <groupId>org.alfresco.skype</groupId> |
12 | - <artifactId>skype-integration-parent</artifactId> | |
12 | + <artifactId>alfresco-skype</artifactId> | |
13 | 13 | <version>1.0-SNAPSHOT</version> |
14 | 14 | </parent> |
15 | 15 | ... | ... |
share-amp/src/main/amp/config/alfresco/web-extension/messages/share-amp.properties
1 | 1 | index 38ae7b759af84a3236c949ed63ee9b714ad84fe7..602ae4ed6c2bba7bb6e9fd907ceac5a03ced6ac3 100644 |
2 | --- a/skype-integration/share-amp/src/main/amp/config/alfresco/web-extension/messages/share-amp.properties | |
2 | +++ b/share-amp/src/main/amp/config/alfresco/web-extension/messages/share-amp.properties | |
1 | -# This file should contain messages and labels specific to this share extension | |
2 | -# Put here things like: | |
3 | -# Content Model Aspect and Type Labels | |
4 | -# Form field labels | |
5 | -# Doc lib Action labels and messages | |
6 | -# Doc Lib Action Forms labels | |
7 | -# | |
8 | - | |
9 | - | |
1 | +# This file should contain messages and labels specific to this share extension | |
2 | +# Put here things like: | |
3 | +# Content Model Aspect and Type Labels | |
4 | +# Form field labels | |
5 | +# Doc lib Action labels and messages | |
6 | +# Doc Lib Action Forms labels | |
7 | +# | |
8 | + | |
9 | + | ... | ... |
share-amp/src/main/amp/config/alfresco/web-extension/share-amp-slingshot-application-context.xml
share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/share-amp-example-widgets.xml
share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml
share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl
share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js
share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md
share-amp/src/main/amp/file-mapping.properties
1 | 1 | index 6acc63f61e89b473d324af54211a50ef77e0b21c..45cccaf5f816ebd150fd8e0c094537a13b5f29cf 100644 |
2 | --- a/skype-integration/share-amp/src/main/amp/file-mapping.properties | |
2 | +++ b/share-amp/src/main/amp/file-mapping.properties | |
1 | -# Custom AMP to WAR location mappings | |
2 | - | |
3 | -# | |
4 | -# The following property can be used to include the standard set of mappings. | |
5 | -# The contents of this file will override any defaults. The default is | |
6 | -# 'true', i.e. the default mappings will be augmented or modified by values in | |
7 | -# this file. | |
8 | -# | |
9 | -include.default=true | |
10 | - | |
11 | -# | |
12 | -# Custom mappings. If 'include.default' is false, then this is the complete set. | |
13 | -# | |
14 | -/web=/ | |
1 | +# Custom AMP to WAR location mappings | |
2 | + | |
3 | +# | |
4 | +# The following property can be used to include the standard set of mappings. | |
5 | +# The contents of this file will override any defaults. The default is | |
6 | +# 'true', i.e. the default mappings will be augmented or modified by values in | |
7 | +# this file. | |
8 | +# | |
9 | +include.default=true | |
10 | + | |
11 | +# | |
12 | +# Custom mappings. If 'include.default' is false, then this is the complete set. | |
13 | +# | |
14 | +/web=/ | ... | ... |
share-amp/src/main/amp/module.properties
1 | 1 | index 2afa1bafdf806a8f511e604188b8b9379833f149..0e5c045a74083732f8a58139188c8829058a7504 100644 |
2 | --- a/skype-integration/share-amp/src/main/amp/module.properties | |
2 | +++ b/share-amp/src/main/amp/module.properties | |
1 | -# Licensed to the Apache Software Foundation (ASF) under one or more | |
2 | -# contributor license agreements. See the NOTICE file distributed with | |
3 | -# this work for additional information regarding copyright ownership. | |
4 | -# The ASF licenses this file to You under the Apache License, Version 2.0 | |
5 | -# (the "License"); you may not use this file except in compliance with | |
6 | -# the License. You may obtain a copy of the License at | |
7 | -# | |
8 | -# http://www.apache.org/licenses/LICENSE-2.0 | |
9 | -# | |
10 | -# Unless required by applicable law or agreed to in writing, software | |
11 | -# distributed under the License is distributed on an "AS IS" BASIS, | |
12 | -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
13 | -# See the License for the specific language governing permissions and | |
14 | -# limitations under the License. | |
15 | - | |
16 | - | |
17 | - | |
18 | -# SDK Sample module | |
19 | - | |
20 | -# ==== Beginning of Alfresco required/optional properties ====== # | |
21 | -# NB: These properties are filtered at build time by Maven, single | |
22 | -# sourcing from POM properties | |
23 | -module.id=${project.artifactId} | |
24 | -#module.aliases=myModule-123, my-module | |
25 | -module.title=${project.name} | |
26 | -module.description=${project.description} | |
27 | -module.version=${noSnapshotVersion} | |
28 | - | |
29 | -# The following optional properties can be used to prevent the module from being added | |
30 | -# to inappropriate versions of the WAR file. | |
31 | -# module.repo.version.min=2.0 | |
32 | -# module.repo.version.max=2.1 | |
33 | - | |
34 | -# FIXME: This dependencies should come out of mvn dependencies on amp | |
35 | - | |
36 | -# The following describe dependencies on other modules | |
37 | -# Depends on net.sf.myproject.module.SupportModuleA version ${version} or later | |
38 | -# module.depends.net.sf.myproject.module.SupportModuleA=${version}-* | |
39 | -# Depends on net.sf.myproject.module.SupportModuleA version ${version} to 2.0 | |
40 | -# module.depends.net.sf.myproject.module.SupportModuleB=${version}-2.0 | |
41 | -# Depends on net.sf.myproject.module.SupportModuleC - any version | |
42 | -# module.depends.net.sf.myproject.module.SupportModuleB=* | |
43 | - | |
44 | - | |
45 | -# ==== End of Alfresco required/optional properties ======= # | |
46 | - | |
47 | - | |
1 | +# Licensed to the Apache Software Foundation (ASF) under one or more | |
2 | +# contributor license agreements. See the NOTICE file distributed with | |
3 | +# this work for additional information regarding copyright ownership. | |
4 | +# The ASF licenses this file to You under the Apache License, Version 2.0 | |
5 | +# (the "License"); you may not use this file except in compliance with | |
6 | +# the License. You may obtain a copy of the License at | |
7 | +# | |
8 | +# http://www.apache.org/licenses/LICENSE-2.0 | |
9 | +# | |
10 | +# Unless required by applicable law or agreed to in writing, software | |
11 | +# distributed under the License is distributed on an "AS IS" BASIS, | |
12 | +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
13 | +# See the License for the specific language governing permissions and | |
14 | +# limitations under the License. | |
15 | + | |
16 | + | |
17 | + | |
18 | +# SDK Sample module | |
19 | + | |
20 | +# ==== Beginning of Alfresco required/optional properties ====== # | |
21 | +# NB: These properties are filtered at build time by Maven, single | |
22 | +# sourcing from POM properties | |
23 | +module.id=${project.artifactId} | |
24 | +#module.aliases=myModule-123, my-module | |
25 | +module.title=${project.name} | |
26 | +module.description=${project.description} | |
27 | +module.version=${noSnapshotVersion} | |
28 | + | |
29 | +# The following optional properties can be used to prevent the module from being added | |
30 | +# to inappropriate versions of the WAR file. | |
31 | +# module.repo.version.min=2.0 | |
32 | +# module.repo.version.max=2.1 | |
33 | + | |
34 | +# FIXME: This dependencies should come out of mvn dependencies on amp | |
35 | + | |
36 | +# The following describe dependencies on other modules | |
37 | +# Depends on net.sf.myproject.module.SupportModuleA version ${version} or later | |
38 | +# module.depends.net.sf.myproject.module.SupportModuleA=${version}-* | |
39 | +# Depends on net.sf.myproject.module.SupportModuleA version ${version} to 2.0 | |
40 | +# module.depends.net.sf.myproject.module.SupportModuleB=${version}-2.0 | |
41 | +# Depends on net.sf.myproject.module.SupportModuleC - any version | |
42 | +# module.depends.net.sf.myproject.module.SupportModuleB=* | |
43 | + | |
44 | + | |
45 | +# ==== End of Alfresco required/optional properties ======= # | |
46 | + | |
47 | + | |
48 | 48 | # ==== Beginning of module required properties/optional ====== # |
49 | 49 | \ No newline at end of file | ... | ... |
share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js
share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css
share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties
share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html
share-amp/src/main/resources/META-INF/share-config-custom.xml.sample
share-amp/src/test/java/org/alfresco/skype/demoamp/DemoPageTestIT.java
share-amp/src/test/java/org/alfresco/skype/demoamp/po/DemoPage.java
share-amp/src/test/resources/testng.xml
share/pom.xml
1 | 1 | index 5c4c867607e0f86a08f2393a22f9032318e7e9f9..772635c6cdcceae7892b5604b9720dec4306a33c 100644 |
2 | --- a/skype-integration/share/pom.xml | |
2 | +++ b/share/pom.xml | |
... | ... | @@ -2,14 +2,14 @@ |
2 | 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
3 | 3 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
4 | 4 | <modelVersion>4.0.0</modelVersion> |
5 | - <artifactId>skype-integration-share</artifactId> | |
5 | + <artifactId>share</artifactId> | |
6 | 6 | <name>Alfresco Share WAR Aggregator</name> |
7 | 7 | <packaging>war</packaging> |
8 | 8 | <description>Alfresco Share aggregator, installs your Share AMPs in the Share WAR for aggregation and easy deployment purposes</description> |
9 | 9 | |
10 | 10 | <parent> |
11 | 11 | <groupId>org.alfresco.skype</groupId> |
12 | - <artifactId>skype-integration-parent</artifactId> | |
12 | + <artifactId>alfresco-skype</artifactId> | |
13 | 13 | <version>1.0-SNAPSHOT</version> |
14 | 14 | </parent> |
15 | 15 | |
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 | <!-- Demonstrating the dependency / installation of the share AMP developed in the 'share-amp' module --> |
30 | 30 | <dependency> |
31 | 31 | <groupId>${project.groupId}</groupId> |
32 | - <artifactId>skype-integration-share-amp</artifactId> | |
32 | + <artifactId>share-amp</artifactId> | |
33 | 33 | <version>${project.version}</version> |
34 | 34 | <type>amp</type> |
35 | 35 | </dependency> |
... | ... | @@ -69,7 +69,7 @@ |
69 | 69 | <!-- Add / sort your AMPs here --> |
70 | 70 | <overlay> |
71 | 71 | <groupId>${project.groupId}</groupId> |
72 | - <artifactId>skype-integration-share-amp</artifactId> | |
72 | + <artifactId>share-amp</artifactId> | |
73 | 73 | <type>amp</type> |
74 | 74 | </overlay> |
75 | 75 | <!-- Uncomment if you are using RM module --> | ... | ... |
share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample
share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample
share/src/main/resources/log4j.properties
1 | 1 | index 7b5b78769138652e1d18f3408495fda16634985e..49d83d0ae3cfd35f9aeaba5dc5b3be02d1197cd8 100644 |
2 | --- a/skype-integration/share/src/main/resources/log4j.properties | |
2 | +++ b/share/src/main/resources/log4j.properties | |
1 | -# Set root logger level to error | |
2 | -log4j.rootLogger=error, Console, File | |
3 | - | |
4 | -###### Console appender definition ####### | |
5 | - | |
6 | -# All outputs currently set to be a ConsoleAppender. | |
7 | -log4j.appender.Console=org.apache.log4j.ConsoleAppender | |
8 | -log4j.appender.Console.layout=org.apache.log4j.PatternLayout | |
9 | - | |
10 | -# use log4j NDC to replace %x with tenant domain / username | |
11 | -log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n | |
12 | -#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n | |
13 | - | |
14 | -###### File appender definition ####### | |
15 | -log4j.appender.File=org.apache.log4j.DailyRollingFileAppender | |
16 | -log4j.appender.File.File=${app.log.dir}share.log | |
17 | -log4j.appender.File.Append=true | |
18 | -log4j.appender.File.DatePattern='.'yyyy-MM-dd | |
19 | -log4j.appender.File.layout=org.apache.log4j.PatternLayout | |
20 | -log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n | |
21 | - | |
22 | -# Spring | |
23 | -log4j.logger.org.springframework=warn | |
24 | -# Turn off Spring remoting warnings that should really be info or debug. | |
25 | -log4j.logger.org.springframework.remoting.support=error | |
26 | -log4j.logger.org.springframework.util=error | |
27 | - | |
28 | -# MyFaces | |
29 | -log4j.logger.org.apache.myfaces.util.DebugUtils=info | |
30 | -log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error | |
31 | -log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error | |
32 | -log4j.logger.org.apache.myfaces.taglib=error | |
33 | - | |
34 | -# Alfresco | |
35 | -log4j.logger.org.alfresco=error | |
36 | -log4j.logger.org.alfresco.config=warn | |
37 | -log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn | |
38 | -log4j.logger.org.alfresco.web=info | |
39 | - | |
40 | -# Web Framework | |
41 | -log4j.logger.org.springframework.extensions.webscripts=info | |
42 | -log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn | |
43 | -log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off | |
44 | - | |
45 | -# Freemarker | |
46 | -# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler | |
1 | +# Set root logger level to error | |
2 | +log4j.rootLogger=error, Console, File | |
3 | + | |
4 | +###### Console appender definition ####### | |
5 | + | |
6 | +# All outputs currently set to be a ConsoleAppender. | |
7 | +log4j.appender.Console=org.apache.log4j.ConsoleAppender | |
8 | +log4j.appender.Console.layout=org.apache.log4j.PatternLayout | |
9 | + | |
10 | +# use log4j NDC to replace %x with tenant domain / username | |
11 | +log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n | |
12 | +#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n | |
13 | + | |
14 | +###### File appender definition ####### | |
15 | +log4j.appender.File=org.apache.log4j.DailyRollingFileAppender | |
16 | +log4j.appender.File.File=${app.log.dir}share.log | |
17 | +log4j.appender.File.Append=true | |
18 | +log4j.appender.File.DatePattern='.'yyyy-MM-dd | |
19 | +log4j.appender.File.layout=org.apache.log4j.PatternLayout | |
20 | +log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n | |
21 | + | |
22 | +# Spring | |
23 | +log4j.logger.org.springframework=warn | |
24 | +# Turn off Spring remoting warnings that should really be info or debug. | |
25 | +log4j.logger.org.springframework.remoting.support=error | |
26 | +log4j.logger.org.springframework.util=error | |
27 | + | |
28 | +# MyFaces | |
29 | +log4j.logger.org.apache.myfaces.util.DebugUtils=info | |
30 | +log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error | |
31 | +log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error | |
32 | +log4j.logger.org.apache.myfaces.taglib=error | |
33 | + | |
34 | +# Alfresco | |
35 | +log4j.logger.org.alfresco=error | |
36 | +log4j.logger.org.alfresco.config=warn | |
37 | +log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn | |
38 | +log4j.logger.org.alfresco.web=info | |
39 | + | |
40 | +# Web Framework | |
41 | +log4j.logger.org.springframework.extensions.webscripts=info | |
42 | +log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn | |
43 | +log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off | |
44 | + | |
45 | +# Freemarker | |
46 | +# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler | |
47 | 47 | log4j.logger.freemarker.runtime= |
48 | 48 | \ No newline at end of file | ... | ... |
share/src/test/resources/alfresco/web-extension/share-config-custom.xml
share/src/test/resources/log4j.properties
solr-config/pom.xml
1 | 1 | index a2c1a6bfb5542e0764d5b9f1f160468be2d1c83f..706e6962a6d8bf8e44d29ca6eca2a6551d3cf9bf 100644 |
2 | --- a/skype-integration/solr-config/pom.xml | |
2 | +++ b/solr-config/pom.xml | |
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
3 | 3 | <modelVersion>4.0.0</modelVersion> |
4 | 4 | |
5 | - <artifactId>skype-integration-solr-config</artifactId> | |
5 | + <artifactId>solr-config</artifactId> | |
6 | 6 | <packaging>pom</packaging> |
7 | 7 | <name>Alfresco Solr 4 Configuration</name> |
8 | 8 | <description>Apache Solr 4 Configuration Customization</description> |
... | ... | @@ -10,7 +10,7 @@ |
10 | 10 | <!-- Setup the parent extension project, which contain all the Alfresco Maven SDK stuff --> |
11 | 11 | <parent> |
12 | 12 | <groupId>org.alfresco.skype</groupId> |
13 | - <artifactId>skype-integration-parent</artifactId> | |
13 | + <artifactId>alfresco-skype</artifactId> | |
14 | 14 | <version>1.0-SNAPSHOT</version> |
15 | 15 | </parent> |
16 | 16 | ... | ... |