Merge pull request #510 from fcrepo4/remove-authz-profile

Remove the authz-enabled profile from fcrepo-webapp
fcrepo · Oct 13, 2014 · b1c152a · b1c152a
2 parents 7dc0fcd + 28e13bc
commit b1c152a
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 176 deletions.
diff --git a/fcrepo-webapp/pom.xml b/fcrepo-webapp/pom.xml
@@ -85,16 +85,6 @@
       <artifactId>fcrepo-transform</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-auth-roles-common</artifactId>
-      <version>4.0.0-beta-04-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-auth-roles-basic</artifactId>
-      <version>4.0.0-beta-04-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.fcrepo</groupId>
       <artifactId>fcrepo-auth-common</artifactId>
@@ -505,34 +495,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>auth-war</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>special-auth-war</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>war</goal>
-                </goals>
-                <configuration>
-                  <classifier>auth</classifier>
-                  <warSourceDirectory>src/main/webapp</warSourceDirectory>
-                  <warSourceDirectory>src/auth/webapp</warSourceDirectory>
-                  <packagingExcludes>WEB-INF/classes/spring/repo.xml</packagingExcludes>
-                  <packagingExcludes>WEB-INF/classes/spring/master.xml</packagingExcludes>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-master.xml b/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-master.xml
diff --git a/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-repo.xml b/fcrepo-webapp/src/auth/webapp/WEB-INF/classes/spring/auth-repo.xml
diff --git a/fcrepo-webapp/src/auth/webapp/WEB-INF/web.xml b/fcrepo-webapp/src/auth/webapp/WEB-INF/web.xml