Make install the default build target

Add missing namespace prefix to example resolver

Resolves bugs SIDP 18 & 19

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2342 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/build.xml b/build.xml
index 02fc75d..b71369d 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<project name="Shibboleth Identity Provider" basedir="." default="package">
+<project name="Shibboleth Identity Provider" basedir="." default="install">
        
        <!-- User based property file that overrides any property below -->
        <property file="${user.name}-build.properties" />
@@ -184,7 +184,6 @@
                        </filterset>
                </copy>
 
-               <symlink link="${idp.home}/bin/aacli.sh" resource="shib-tools.sh" overwrite="true" />
                <chmod file="${idp.home}/bin/*.sh" perm="+x" />
 
                <copy todir="${webinf-temp.dir}">

diff --git a/resources/conf/attribute-resolver.xml b/resources/conf/attribute-resolver.xml
index c3dc5a0..4167d4d 100644 (file)
--- a/resources/conf/attribute-resolver.xml
+++ b/resources/conf/attribute-resolver.xml
@@ -18,57 +18,57 @@
     <!-- ========================================== -->
     
     <!-- Release the Principal as an attribute and encode it as the SAML 1 and 2 name IDs -->
-    <resolver:AttributeDefinition id="principalName" xsi:type="ad:PrincipalName">
-        <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier"
+    <resolver:AttributeDefinition id="principalName" xsi:type="PrincipalName" xmlns="urn:mace:shibboleth:2.0:resolver:ad">
+        <resolver:AttributeEncoder xsi:type="SAML1StringNameIdentifier" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
                                    nameFormat="urn:mace:shibboleth:1.0:nameIdentifier" />
 
-        <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID"
+        <resolver:AttributeEncoder xsi:type="SAML2StringNameID" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
                                    nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified" />
    </resolver:AttributeDefinition>
     
     <!-- Example attribute defintions -->
     <!--
-    <resolver:AttributeDefinition id="uid" xsi:type="ad:Simple">
+    <resolver:AttributeDefinition id="uid" xsi:type="Simple"  xmlns="urn:mace:shibboleth:2.0:resolver:ad">
         <resolver:DataConnectorDependency ref="myLDAP" />
         
-        <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" />
+        <resolver:AttributeEncoder xsi:type="SAML2StringNameID" xmlns="urn:mace:shibboleth:2.0:attribute:encoder" />
         
-        <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" />
+        <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" xmlns="urn:mace:shibboleth:2.0:attribute:encoder" />
     </resolver:AttributeDefinition>
     -->
     
     <!--
-    <resolver:AttributeDefinition id="scopedPrimaryAffiliation" xsi:type="ad:Scoped"
+    <resolver:AttributeDefinition id="scopedPrimaryAffiliation" xsi:type="Scoped"  xmlns="urn:mace:shibboleth:2.0:resolver:ad"
                                   scope="example.org"
                                   sourceAttributeID="eduPersonPrimaryAffiliation">
         <resolver:DataConnectorDependency ref="myLDAP" />
         
-        <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString"
+        <resolver:AttributeEncoder xsi:type="SAML1ScopedString" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
                                    name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation"/>
         
-        <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString"
+        <resolver:AttributeEncoder xsi:type="SAML2ScopedString" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
                                    name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation"/>
 
     </resolver:AttributeDefinition>
     -->
     
     <!--
-    <resolver:AttributeDefinition id="affiliation" xsi:type="ad:Simple"
+    <resolver:AttributeDefinition id="affiliation" xsi:type="Simple"  xmlns="urn:mace:shibboleth:2.0:resolver:ad"
                                    sourceAttribute="eduPersonAffiliation">
         <resolver:DataConnectorDependency ref="staticAttributes" />
         <resolver:DataConnectorDependency ref="myLDAP" />
         
-        <resolver:AttributeEncoder xsi:type="enc:SAML1String"
+        <resolver:AttributeEncoder xsi:type="SAML1String" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
                                    name="urn:mace:dir:attribute-def:eduPersondAffiliation"/>
         
-        <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+        <resolver:AttributeEncoder xsi:type="SAML2String" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
                                    name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
                                    friendlyName="eduPersonAffiliation"/>
     </resolver:AttributeDefinition>
     -->
     
     <!--
-    <resolver:AttributeDefinition id="fullName" xsi:type="Script" >
+    <resolver:AttributeDefinition id="fullName" xsi:type="Script" xmlns="urn:mace:shibboleth:2.0:resolver:ad">
         <resolver:DataConnectorDependency ref="myLDAP" />
         
         <Script>
@@ -88,47 +88,47 @@
     
     <!-- Example Static Connector -->
     <!--
-    <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
-        <dc:Attribute id="eduPersonAffiliation">
-            <dc:Value>member</dc:Value>
-        </dc:Attribute>
-        <dc:Attribute id="eduPersonEntitlement">
-            <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
-            <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
-        </dc:Attribute>
+    <resolver:DataConnector id="staticAttributes" xsi:type="Static" xmlns="urn:mace:shibboleth:2.0:resolver:dc">
+        <Attribute id="eduPersonAffiliation">
+            <Value>member</Value>
+        </Attribute>
+        <Attribute id="eduPersonEntitlement">
+            <Value>urn:example.org:entitlement:entitlement1</Value>
+            <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
+        </Attribute>
     </resolver:DataConnector>
     -->
     
     <!-- Example Relational Database Connector -->
     <!--
-    <resolver:DataConnector id="mySIS" xsi:type="dc:RelationalDatabase">
-        <dc:ApplicationManagedConnection jdbcDriver="oracle.jdbc.driver.OracleDriver"
-                                         jdbcUrl="jdbc:oracle:thin:@db.example.org:1521:SomeDB"
-                                         jdbcUserName="myid"
-                                         jdbcPassword="mypassword" />
-        <dc:QueryTemplate>
+    <resolver:DataConnector id="mySIS" xsi:type="RelationalDatabase" xmlns="urn:mace:shibboleth:2.0:resolver:dc">
+        <ApplicationManagedConnection jdbcDriver="oracle.jdbc.driver.OracleDriver"
+                                      jdbcUrl="jdbc:oracle:thin:@db.example.org:1521:SomeDB"
+                                      jdbcUserName="myid"
+                                      jdbcPassword="mypassword" />
+        <QueryTemplate>
             <![CDATA[
                  SELECT * FROM student WHERE gzbtpid = ${principal}
              ]]>
-        </dc:QueryTemplate>
+        </QueryTemplate>
     
-        <dc:Column columnName="gzbtpid" attributeID="uid"/>
-        <dc:Column columnName="fqlft" attributeID="gpa" type="Float"/>
+        <Column columnName="gzbtpid" attributeID="uid"/>
+        <Column columnName="fqlft" attributeID="gpa" type="Float"/>
     </resolver:DataConnector>
     -->
     
     <!-- Example LDAP Connector -->
     <!--
-    <resolver:DataConnector id="myLDAP" xsi:type="LDAPDirectory"
+    <resolver:DataConnector id="myLDAP" xsi:type="LDAPDirectory" xmlns="urn:mace:shibboleth:2.0:resolver:dc"
                             ldapUrl="ldap://ldap.example.org"
                             baseDN="ou=people,dc=example,dc=org"
                             principal="uid=myservice,ou=system"
                             principalCredential="myServicePassword">
-        <dc:FilterTemplate>
+        <FilterTemplate>
             <![CDATA[
                 (uid=${principal})
             ]]>
-        </dc:FilterTemplate>
+        </FilterTemplate>
     
     </resolver:DataConnector>
     -->
@@ -136,11 +136,11 @@
     <!-- ========================================== -->
     <!--      Principal Connectors                  -->
     <!-- ========================================== -->
-    <resolver:PrincipalConnector xsi:type="pc:Direct" 
+    <resolver:PrincipalConnector xsi:type="Direct" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
                                  id="saml1UnspecDirect"
                                  nameIDFormat="urn:oasis:names:tc:SAML:1.0:nameid-format:unspecified" />
                                  
-    <resolver:PrincipalConnector xsi:type="pc:Direct" 
+    <resolver:PrincipalConnector xsi:type="Direct" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
                                  id="saml2UnspecDirect"
                                  nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified" />
 

diff --git a/tools/shib-tools.sh b/tools/aacli.sh
similarity index 81%
rename from tools/shib-tools.sh
rename to tools/aacli.sh
index 5f387bf..81a7790 100755 (executable)
--- a/tools/shib-tools.sh
+++ b/tools/aacli.sh
@@ -9,9 +9,6 @@ declare LIBDIR
 LOCATION=$0
 LOCATION=${LOCATION%/*}
 
-COMMAND=$0
-COMMAND=${COMMAND##*/}
-
 if [ -z "$JAVA_HOME" ] ; then
   echo "ERROR: JAVA_HOME environment variable is not set."
   exit
@@ -43,10 +40,4 @@ do
     fi
 done
 
-case "$COMMAND" in
-  
-  aacli.sh)
-    "$JAVACMD" '-classpath' "$LOCALCLASSPATH" 'edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"
-  ;;
-
-esac
\ No newline at end of file
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" 'edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"
\ No newline at end of file