Commit 59035c6d0290ff69c704755092af7243edd538cc
1 parent
a781ecbbe7
Exists in
master
Revert "Revert "Updated references to amp artifact ids.""
This reverts commit a781ecbbe7cf70ad8aef0b88ca2f17e5a9b7da8e.
Showing
4 changed files
with
10 additions
and
10 deletions
Show diff stats
repo/pom.xml
| ... | ... | @@ -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>repo-amp</artifactId> | |
| 45 | + <artifactId>alfresco-skype-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>repo-amp</artifactId> | |
| 94 | + <artifactId>alfresco-skype-repo-amp</artifactId> | |
| 95 | 95 | <type>amp</type> |
| 96 | 96 | </overlay> |
| 97 | 97 | <!-- Uncomment if you are using SPP --> | ... | ... |
runner/tomcat/context-repo.xml
| ... | ... | @@ -13,11 +13,11 @@ |
| 13 | 13 | <Context docBase="${project.parent.basedir}/alfresco-war/target/${project.build.finalName}"> |
| 14 | 14 | <!-- Pick up static resource files from AMPs and other directories (this should not include docBase) --> |
| 15 | 15 | <Resources className="org.apache.naming.resources.VirtualDirContext" |
| 16 | - extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" /> | |
| 16 | + extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/alfresco-skype-repo-amp/web" /> | |
| 17 | 17 | <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Repo AMP, |
| 18 | 18 | it would look something like this: |
| 19 | 19 | <Resources className="org.apache.naming.resources.VirtualDirContext" |
| 20 | - extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web,/=${project.parent.basedir}/component-a-repo/target/component-a-repo/web" /> | |
| 20 | + extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/alfresco-skype-repo-amp/web,/=${project.parent.basedir}/component-a-repo/target/component-a-repo/web" /> | |
| 21 | 21 | --> |
| 22 | 22 | |
| 23 | 23 | <!-- Configure where the Alfresco (alfresco.war) web application can load classes, test classes, and config files --> |
| ... | ... | @@ -31,7 +31,7 @@ |
| 31 | 31 | <Loader className="org.apache.catalina.loader.VirtualWebappLoader" |
| 32 | 32 | searchVirtualFirst="true" |
| 33 | 33 | virtualClasspath="${project.parent.basedir}/repo-amp/target/classes; |
| 34 | - ${project.parent.basedir}/repo-amp/target/repo-amp/config; | |
| 34 | + ${project.parent.basedir}/repo-amp/target/alfresco-skype-repo-amp/config; | |
| 35 | 35 | ${project.parent.basedir}/repo-amp/target/test-classes" /> |
| 36 | 36 | |
| 37 | 37 | <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR --> | ... | ... |
runner/tomcat/context-share.xml
| ... | ... | @@ -10,11 +10,11 @@ |
| 10 | 10 | <!-- Pick up static resource files from any Share extensions, being it a JAR or an AMP |
| 11 | 11 | (this should not include docBase) --> |
| 12 | 12 | <Resources className="org.apache.naming.resources.VirtualDirContext" |
| 13 | - extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" /> | |
| 13 | + extraResourcePaths="/=${project.parent.basedir}/share-amp/target/alfresco-skype-share-amp/web" /> | |
| 14 | 14 | <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Share AMP, |
| 15 | 15 | it would look something like this: |
| 16 | 16 | <Resources className="org.apache.naming.resources.VirtualDirContext" |
| 17 | - extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web,/=${project.parent.basedir}/component-a-share/target/component-a-share/web" /> | |
| 17 | + extraResourcePaths="/=${project.parent.basedir}/share-amp/target/alfresco-skype-share-amp/web,/=${project.parent.basedir}/component-a-share/target/component-a-share/web" /> | |
| 18 | 18 | --> |
| 19 | 19 | |
| 20 | 20 | <!-- Configure where the Share (share.war) web application can load classes, config, and test classes (in that order) --> |
| ... | ... | @@ -30,7 +30,7 @@ |
| 30 | 30 | <Loader className="org.apache.catalina.loader.VirtualWebappLoader" |
| 31 | 31 | searchVirtualFirst="true" |
| 32 | 32 | virtualClasspath="${project.parent.basedir}/share-amp/target/classes; |
| 33 | - ${project.parent.basedir}/share-amp/target/share-amp/config; | |
| 33 | + ${project.parent.basedir}/share-amp/target/alfresco-skype-share-amp/config; | |
| 34 | 34 | ${project.parent.basedir}/share-amp/target/test-classes; |
| 35 | 35 | ${project.parent.basedir}/share/target/test-classes" /> |
| 36 | 36 | ... | ... |
share/pom.xml
| ... | ... | @@ -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>share-amp</artifactId> | |
| 32 | + <artifactId>alfresco-skype-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>share-amp</artifactId> | |
| 72 | + <artifactId>alfresco-skype-share-amp</artifactId> | |
| 73 | 73 | <type>amp</type> |
| 74 | 74 | </overlay> |
| 75 | 75 | <!-- Uncomment if you are using RM module --> | ... | ... |