--- old/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java	2013-06-28 11:34:01.585556593 -0400
+++ new/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java	2013-06-28 11:34:01.409562072 -0400
@@ -2,27 +2,28 @@
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
-/*
- * Copyright  1999-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package com.sun.org.apache.xml.internal.security.signature;
 
 import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
 import com.sun.org.apache.xml.internal.security.utils.Constants;
-import com.sun.org.apache.xml.internal.security.utils.IdResolver;
 import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -37,96 +38,96 @@
  */
 public class SignatureProperty extends SignatureElementProxy {
 
-   /**
-    * Constructs{@link SignatureProperty} using specified <code>Target</code> attribute
-    *
-    * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
-    * @param Target the <code>Target</code> attribute references the <code>Signature</code> element to which the property applies SignatureProperty
-    */
-   public SignatureProperty(Document doc, String Target) {
-      this(doc, Target, null);
-   }
-
-   /**
-    * Constructs {@link SignatureProperty} using sepcified <code>Target</code> attribute and <code>Id</code> attribute
-    *
-    * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
-    * @param Target the <code>Target</code> attribute references the <code>Signature</code> element to which the property applies
-    * @param Id the <code>Id</code> will be specified by {@link Reference#getURI} in validation
-    */
-   public SignatureProperty(Document doc, String Target, String Id) {
-
-      super(doc);
-
-      this.setTarget(Target);
-      this.setId(Id);
-   }
-
-   /**
-    * Constructs a {@link SignatureProperty} from an {@link Element}
-    * @param element <code>SignatureProperty</code> element
-    * @param BaseURI the URI of the resource where the XML instance was stored
-    * @throws XMLSecurityException
-    */
-   public SignatureProperty(Element element, String BaseURI)
-           throws XMLSecurityException {
-      super(element, BaseURI);
-   }
-
-   /**
-    *   Sets the <code>Id</code> attribute
-    *
-    *   @param Id the <code>Id</code> attribute
-    */
-   public void setId(String Id) {
-
-      if (Id != null) {
-          setLocalIdAttribute(Constants._ATT_ID, Id);
-      }
-   }
-
-   /**
-    * Returns the <code>Id</code> attribute
-    *
-    * @return the <code>Id</code> attribute
-    */
-   public String getId() {
-      return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
-   }
-
-   /**
-    * Sets the <code>Target</code> attribute
-    *
-    * @param Target the <code>Target</code> attribute
-    */
-   public void setTarget(String Target) {
-
-      if ((Target != null)) {
-         this._constructionElement.setAttributeNS(null, Constants._ATT_TARGET, Target);
-      }
-   }
-
-   /**
-    * Returns the <code>Target</code> attribute
-    *
-    * @return the <code>Target</code> attribute
-    */
-   public String getTarget() {
-      return this._constructionElement.getAttributeNS(null, Constants._ATT_TARGET);
-   }
-
-   /**
-    * Method appendChild
-    *
-    * @param node
-    * @return the node in this element.
-    */
-   public Node appendChild(Node node) {
-      return this._constructionElement.appendChild(node);
-   }
-
-   /** @inheritDoc */
-   public String getBaseLocalName() {
-      return Constants._TAG_SIGNATUREPROPERTY;
-   }
+    /**
+     * Constructs{@link SignatureProperty} using specified <code>target</code> attribute
+     *
+     * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
+     * @param target the <code>target</code> attribute references the <code>Signature</code> 
+     * element to which the property applies SignatureProperty
+     */
+    public SignatureProperty(Document doc, String target) {
+        this(doc, target, null);
+    }
+
+    /**
+     * Constructs {@link SignatureProperty} using sepcified <code>target</code> attribute and 
+     * <code>id</code> attribute
+     *
+     * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
+     * @param target the <code>target</code> attribute references the <code>Signature</code>
+     *  element to which the property applies
+     * @param id the <code>id</code> will be specified by {@link Reference#getURI} in validation
+     */
+    public SignatureProperty(Document doc, String target, String id) {
+        super(doc);
+
+        this.setTarget(target);
+        this.setId(id);
+    }
+
+    /**
+     * Constructs a {@link SignatureProperty} from an {@link Element}
+     * @param element <code>SignatureProperty</code> element
+     * @param BaseURI the URI of the resource where the XML instance was stored
+     * @throws XMLSecurityException
+     */
+    public SignatureProperty(Element element, String BaseURI) throws XMLSecurityException {
+        super(element, BaseURI);
+    }
+
+    /**
+     *   Sets the <code>id</code> attribute
+     *
+     *   @param id the <code>id</code> attribute
+     */
+    public void setId(String id) {
+        if (id != null) {
+            this.constructionElement.setAttributeNS(null, Constants._ATT_ID, id);
+            this.constructionElement.setIdAttributeNS(null, Constants._ATT_ID, true);
+        }
+    }
+
+    /**
+     * Returns the <code>id</code> attribute
+     *
+     * @return the <code>id</code> attribute
+     */
+    public String getId() {
+        return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
+    }
+
+    /**
+     * Sets the <code>target</code> attribute
+     *
+     * @param target the <code>target</code> attribute
+     */
+    public void setTarget(String target) {
+        if (target != null) {
+            this.constructionElement.setAttributeNS(null, Constants._ATT_TARGET, target);
+        }
+    }
+
+    /**
+     * Returns the <code>target</code> attribute
+     *
+     * @return the <code>target</code> attribute
+     */
+    public String getTarget() {
+        return this.constructionElement.getAttributeNS(null, Constants._ATT_TARGET);
+    }
+
+    /**
+     * Method appendChild
+     *
+     * @param node
+     * @return the node in this element.
+     */
+    public Node appendChild(Node node) {
+        return this.constructionElement.appendChild(node);
+    }
+
+    /** @inheritDoc */
+    public String getBaseLocalName() {
+        return Constants._TAG_SIGNATUREPROPERTY;
+    }
 }