swamid 2.0 structure

1 files changed, 22 insertions, 19 deletions

diff --git a/NewMakefile b/NewMakefile
index 61d684a0..4746ea02 100644
--- a/NewMakefile
+++ b/NewMakefile
@@ -4,7 +4,7 @@ CERT=/opt/swamid-credentials/swamid-signer.crt
 PASS=$(shell cat /opt/swamid-credentials/swamid-signer-pass.txt)
 DEST=/opt/published-metadata
 
-all: update clean sign tou
+all: update clean sign
 
 update:
 #	@svn up -q
@@ -15,29 +15,36 @@ MXML=$(shell echo *.mxml)
 
 sign: keys swamid nya nya-testing swamid-testing swamid-testing-idp swamid-kalmar swamid-kalmar-testing swamid-edugain-testing swamid-ki-sll swamid-fiv-test
 
-tou: swamid-tou-en.txt swamid-tou-sv.txt
-	@cp swamid-tou-en.txt swamid-tou-sv.txt $(DEST)
+swamid-externals: swamid-externals1 swamid-externals2
 
-urn-mace-swami.se-swamid-test-1.0-metadata.mxml:
-	@sed 's!http://md.swamid.se/md/swamid-1.0.xml!urn:mace:swami.se:swamid:test-1.0!g' < swamid-1.0.mxml > urn-mace-swami.se-swamid-test-1.0-metadata.mxml
+swamid-externals1:
+	@scripts/aggregate.sh swamid-externals-1.0
 
-swamid-compat: urn-mace-swami.se-swamid-test-1.0-metadata.mxml
-	@saml-md-tool urn-mace-swami.se-swamid-test-1.0-metadata update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml $(DEST)/urn-mace-swami.se-swamid-test-1.0-metadata.xml
-	@test -s urn-mace-swami.se-swamid-test-1.0-metadata.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata.xml $(DEST)/urn-mace-swami.se-swamid-test-1.0-metadata-signed.xml
-	@rm -f urn-mace-swami.se-swamid-test-1.0-metadata.mxml
+swamid-externals2:
+	@scripts/aggregate.sh swamid-externals-2.0
 
-swamid-externals:
-	@scripts/aggregate.sh swamid-externals-1.0
+swamid-interfederations: swamid-interfederations1 swamid-interfederations2
 
-swamid-interfederations:
+swamid-interfederations1:
 	@scripts/aggregate.sh swamid-interfederations-1.0
 
-swamid:
+swamid-interfederations2:
+	@scripts/aggregate.sh swamid-interfederations-2.0
+
+swamid: swamid1 swamid2
+
+swamid1:
 	@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST)
 	#@test -s swamid-1.0-unsigned.xml && cp swamid-1.0-unsigned.xml $(DEST)
 
+swamid2: swamid-backport-1.0.xml
+	@saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-2.0.xml && cp swamid-2.0.xml $(DEST)
+
+swamid-backport-1.0.xml:
+	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-1.0.mxml > swamid-backport-1.0.xml
+
 nya:
 	@saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s nya-1.0.xml && cp nya-1.0.xml $(DEST)
@@ -55,10 +62,6 @@ swamid-testing-idp:
 	@saml-md-tool swamid-testing-idp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-testing-idp-1.0.xml && cp swamid-testing-idp-1.0.xml $(DEST)
 
-old-swamid-testing:
-	@saml-md-tool swamid-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-1.0-testing.xml && cp swamid-1.0-testing.xml $(DEST)
-
 swamid-edugain-testing:
 	@saml-md-tool swamid-edugain-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-edugain-testing-1.0.xml && cp swamid-edugain-testing-1.0.xml $(DEST)
@@ -79,7 +82,7 @@ swamid-fiv-test:
 	@saml-md-tool swamid-fiv-test update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-fiv-test.xml && cp swamid-fiv-test.xml $(DEST)
 
-test:
+test: swamid-backport-1.0.xml
 	@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema  schema.xsd $$x; done
 
 clean: